X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=182eca69df6353804009d589fba8dc29f6fab398;hp=251b5d0749a8348132de2555e56f00842777b577;hb=b5d3e1688133077ca20542a20dcd8919147e72e1;hpb=5e11d962c02d583f38991adc4eec78872ccb23e4

diff --git a/Makefile.am b/Makefile.am
index 251b5d074..182eca69d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,7 @@ LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
 LIBSYSTEMD_CURRENT=0
-LIBSYSTEMD_REVISION=1
+LIBSYSTEMD_REVISION=2
 LIBSYSTEMD_AGE=0
 
 # Dirs of external packages
@@ -366,6 +366,7 @@ dist_bashcompletion_DATA = \
 	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 \
@@ -791,7 +792,10 @@ libsystemd_shared_la_SOURCES = \
 	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 \
@@ -1835,7 +1839,8 @@ systemgenerator_PROGRAMS +=  \
 	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 \
@@ -1960,14 +1965,16 @@ systemd_nspawn_SOURCES = \
 
 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 \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	$(BLKID_LIBS)
 
 if HAVE_SECCOMP
 systemd_nspawn_LDADD += \
@@ -2446,6 +2453,7 @@ libsystemd_network_la_SOURCES = \
 	src/libsystemd-network/ipv4ll-internal.h
 
 libsystemd_network_la_LIBADD = \
+	libsystemd-label.la \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
@@ -2467,6 +2475,7 @@ test_dhcp_client_SOURCES = \
 
 test_dhcp_client_LDADD = \
 	libsystemd-network.la \
+	libsystemd-label.la \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
@@ -2568,7 +2577,6 @@ dist_network_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 \
@@ -2585,6 +2593,9 @@ dist_udevrules_DATA += \
 	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 \
@@ -4954,7 +4965,7 @@ kdbus-update:
 	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/
@@ -4971,7 +4982,7 @@ doc-sync: all destdir-sphinx
 
 .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