chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS: 211 was actually released past midnight, so let's use the correct date
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 59cde40f3a790cb00d13cad595d887b2f9af2d63..bd78f444c506eee885597c9d783ccc60ab0da80d 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-60,7
+60,7
@@
LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
LIBSYSTEMD_CURRENT=0
LIBSYSTEMD_JOURNAL_AGE=11
LIBSYSTEMD_CURRENT=0
-LIBSYSTEMD_REVISION=
1
+LIBSYSTEMD_REVISION=
2
LIBSYSTEMD_AGE=0
# Dirs of external packages
LIBSYSTEMD_AGE=0
# Dirs of external packages
@@
-207,8
+207,8
@@
define move-to-rootlibdir
if test "$(libdir)" != "$(rootlibdir)"; then \
$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
if test "$(libdir)" != "$(rootlibdir)"; then \
$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
-
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g')
&& \
- $(LN_S) --relative -f $
$so_img_rel_target_prefix
$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+
rm -f $(DESTDIR)$(libdir)/$$libname
&& \
+ $(LN_S) --relative -f $
(DESTDIR)
$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
fi
endef
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
fi
endef
@@
-311,6
+311,10
@@
AM_V_LN = $(AM_V_LN_$(V))
AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
AM_V_LN_0 = @echo " LN " $@;
AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
AM_V_LN_0 = @echo " LN " $@;
+AM_V_RM = $(AM_V_RM_$(V))
+AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY))
+AM_V_RM_0 = @echo " RM " $@;
+
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemctl \
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemctl \
@@
-361,6
+365,7
@@
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
+ shell-completion/bash/systemd-cat \
shell-completion/bash/systemd-cgls \
shell-completion/bash/systemd-cgtop \
shell-completion/bash/systemd-delta \
shell-completion/bash/systemd-cgls \
shell-completion/bash/systemd-cgtop \
shell-completion/bash/systemd-delta \
@@
-786,7
+791,10
@@
libsystemd_shared_la_SOURCES = \
src/shared/condition-util.c \
src/shared/condition-util.h \
src/shared/bus-label.c \
src/shared/condition-util.c \
src/shared/condition-util.h \
src/shared/bus-label.c \
- src/shared/bus-label.h
+ src/shared/bus-label.h \
+ src/shared/gpt.h \
+ src/shared/generator.h \
+ src/shared/generator.c
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
@@
-1830,7
+1838,8
@@
systemgenerator_PROGRAMS += \
systemd-gpt-auto-generator
systemd_gpt_auto_generator_SOURCES = \
systemd-gpt-auto-generator
systemd_gpt_auto_generator_SOURCES = \
- src/gpt-auto-generator/gpt-auto-generator.c
+ src/gpt-auto-generator/gpt-auto-generator.c \
+ src/shared/blkid-util.h
systemd_gpt_auto_generator_LDADD = \
libsystemd-label.la \
systemd_gpt_auto_generator_LDADD = \
libsystemd-label.la \
@@
-1859,6
+1868,7
@@
systemd_dbus1_generator_LDADD = \
dbus1-generator-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
dbus1-generator-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
+ $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
$(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
dbus1-generator-uninstall-hook:
$(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
dbus1-generator-uninstall-hook:
@@
-1954,14
+1964,16
@@
systemd_nspawn_SOURCES = \
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS) \
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(BLKID_CFLAGS)
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ $(BLKID_LIBS)
if HAVE_SECCOMP
systemd_nspawn_LDADD += \
if HAVE_SECCOMP
systemd_nspawn_LDADD += \
@@
-1989,6
+2001,7
@@
systemd_bus_proxyd_LDADD = \
bus-proxyd-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
bus-proxyd-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
+ $(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
$(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
bus-proxyd-uninstall-hook:
$(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
bus-proxyd-uninstall-hook:
@@
-2422,6
+2435,7
@@
libsystemd_network_la_SOURCES = \
src/systemd/sd-network.h \
src/systemd/sd-dhcp-client.h \
src/systemd/sd-dhcp-lease.h \
src/systemd/sd-network.h \
src/systemd/sd-dhcp-client.h \
src/systemd/sd-dhcp-lease.h \
+ src/systemd/sd-ipv4ll.h \
src/network/sd-network.c \
src/network/network-util.h \
src/libsystemd-network/sd-dhcp-client.c \
src/network/sd-network.c \
src/network/network-util.h \
src/libsystemd-network/sd-dhcp-client.c \
@@
-2431,9
+2445,14
@@
libsystemd_network_la_SOURCES = \
src/libsystemd-network/dhcp-internal.h \
src/libsystemd-network/dhcp-protocol.h \
src/libsystemd-network/dhcp-lease-internal.h \
src/libsystemd-network/dhcp-internal.h \
src/libsystemd-network/dhcp-protocol.h \
src/libsystemd-network/dhcp-lease-internal.h \
- src/libsystemd-network/sd-dhcp-lease.c
+ src/libsystemd-network/sd-dhcp-lease.c \
+ src/libsystemd-network/sd-ipv4ll.c \
+ src/libsystemd-network/ipv4ll-network.c \
+ src/libsystemd-network/ipv4ll-packet.c \
+ src/libsystemd-network/ipv4ll-internal.h
libsystemd_network_la_LIBADD = \
libsystemd_network_la_LIBADD = \
+ libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
@@
-2455,6
+2474,7
@@
test_dhcp_client_SOURCES = \
test_dhcp_client_LDADD = \
libsystemd-network.la \
test_dhcp_client_LDADD = \
libsystemd-network.la \
+ libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
@@
-2556,7
+2576,6
@@
dist_network_DATA = \
network/80-container-host0.network
dist_udevrules_DATA += \
network/80-container-host0.network
dist_udevrules_DATA += \
- rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
@@
-2573,6
+2592,9
@@
dist_udevrules_DATA += \
rules/80-net-setup-link.rules \
rules/95-udev-late.rules
rules/80-net-setup-link.rules \
rules/95-udev-late.rules
+nodist_udevrules_DATA += \
+ rules/99-systemd.rules
+
dist_udevhwdb_DATA = \
hwdb/20-pci-vendor-model.hwdb \
hwdb/20-pci-classes.hwdb \
dist_udevhwdb_DATA = \
hwdb/20-pci-vendor-model.hwdb \
hwdb/20-pci-classes.hwdb \
@@
-4942,7
+4964,7
@@
kdbus-update:
wget -N https://d-bus.googlecode.com/git/kdbus.h )
.PHONY: upload
wget -N https://d-bus.googlecode.com/git/kdbus.h )
.PHONY: upload
-upload: all
distcheck
+upload: all
check dist
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
scp man/*.html tango:public/systemd-man/
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
scp man/*.html tango:public/systemd-man/
@@
-4959,7
+4981,7
@@
doc-sync: all destdir-sphinx
.PHONY: git-tag
git-tag:
.PHONY: git-tag
git-tag:
- git tag "v$(VERSION)" -m "systemd $(VERSION)"
+ git tag
-s
"v$(VERSION)" -m "systemd $(VERSION)"
.PHONY: install-tree
install-tree: all
.PHONY: install-tree
install-tree: all