X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=5d846052d80088bee77a0d97900aab4e4ab4fd43;hp=4fe766aa638609f4f16268e7fa3ce49859e03b9b;hb=50d6810ea8117bbfcf7007ae779d1a98a7300b5f;hpb=4851ac45269f539ff8c90fe686178128584b820c

diff --git a/Makefile.am b/Makefile.am
index 4fe766aa6..5d846052d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1961,6 +1961,7 @@ systemd_cgls_SOURCES = \
 	src/cgls/cgls.c
 
 systemd_cgls_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2107,6 +2108,8 @@ libsystemd_internal_la_SOURCES = \
 	src/libsystemd/sd-rtnl/sd-rtnl.c \
 	src/libsystemd/sd-rtnl/rtnl-internal.h \
 	src/libsystemd/sd-rtnl/rtnl-message.c \
+	src/libsystemd/sd-rtnl/rtnl-types.h \
+	src/libsystemd/sd-rtnl/rtnl-types.c \
 	src/libsystemd/sd-rtnl/rtnl-util.h \
 	src/libsystemd/sd-rtnl/rtnl-util.c \
 	src/libsystemd/sd-id128/sd-id128.c \
@@ -3877,12 +3880,10 @@ nodist_userunit_DATA += \
 	units/user/systemd-bus-driverd.service
 
 USER_BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.DBus.busname \
-	org.freedesktop.systemd1.busname
+	org.freedesktop.DBus.busname
 
 USER_UNIT_ALIASES += \
-	$(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname \
-	$(systemunitdir)/org.freedesktop.systemd1.busname org.freedesktop.systemd1.busname
+	$(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname
 endif
 
 EXTRA_DIST += \
@@ -5036,9 +5037,9 @@ DISTCHECK_CONFIGURE_FLAGS += \
 endif
 
 # check "broken" platforms limited toolchains for link breakage before we release
-.PHONY: check-broken
-check-broken:
-	$(MAKE) CFLAGS='-fno-lto' LDFLAGS='-Wl,--no-as-needed -Wl,--no-gc-sections' distcheck
+.PHONY: linkcheck
+linkcheck:
+	$(MAKE) CFLAGS='-fno-lto' LDFLAGS='-Wl,-fuse-ld=gold -Wl,--as-needed -Wl,--no-gc-sections' distcheck
 
 .PHONY: hwdb-update
 hwdb-update:
@@ -5051,16 +5052,18 @@ hwdb-update:
 
 .PHONY: kdbus-update
 kdbus-update:
-	( cd $(top_srcdir)/src/libsystemd/ && \
+	( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \
 	wget -N https://d-bus.googlecode.com/git/kdbus.h )
 
+.PHONY: git-tag
+git-tag:
+	git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
+
+www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
 .PHONY: upload
 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/
+	scp systemd-$(VERSION).tar.xz $(www_target)
 
-www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
 .PHONY: doc-sync
 doc-sync: all destdir-sphinx
 	gtkdoc-rebase --html-dir=docs/libudev/html --online
@@ -5070,9 +5073,10 @@ doc-sync: all destdir-sphinx
 	rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
 	rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
 
-.PHONY: git-tag
-git-tag:
-	git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
+.PHONY: tango
+tango: upload
+	cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
+	scp man/*.html tango:public/systemd-man/
 
 .PHONY: install-tree
 install-tree: all