X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=88371a2df43837c057dcbb3f70111cc4c58face0;hb=e57e4e2be345f346bb49547ecad71dc000c406b2;hp=abef51779d0976a9b9444c1d93e1dfcb4d411e7f;hpb=5870f79a0bb7d891b1cdb20043816aa2a21c0425;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index abef51779..88371a2df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1172,6 +1172,7 @@ manual_tests += \
 	test-hostname \
 	test-daemon \
 	test-cgroup \
+	test-cgroup-mask \
 	test-install \
 	test-watchdog \
 	test-log \
@@ -1199,7 +1200,6 @@ tests += \
 	test-calendarspec \
 	test-strip-tab-ansi \
 	test-cgroup-util \
-	test-cgroup-mask \
 	test-prioq \
 	test-fileio \
 	test-time \
@@ -3866,21 +3866,23 @@ nodist_systemunit_DATA += \
 	units/systemd-bus-driverd.service
 
 dist_systemunit_DATA += \
-	units/org.freedesktop.DBus.busname	\
+	units/org.freedesktop.DBus.busname \
 	units/org.freedesktop.systemd1.busname
 
 BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.DBus.busname	\
+	org.freedesktop.DBus.busname \
 	org.freedesktop.systemd1.busname
 
 nodist_userunit_DATA += \
 	units/user/systemd-bus-driverd.service
 
 USER_BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.DBus.busname
+	org.freedesktop.DBus.busname \
+	org.freedesktop.systemd1.busname
 
 USER_UNIT_ALIASES += \
-	$(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname
+	$(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname \
+	$(systemunitdir)/org.freedesktop.systemd1.busname org.freedesktop.systemd1.busname
 endif
 
 EXTRA_DIST += \
@@ -5034,9 +5036,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:
@@ -5052,13 +5054,15 @@ kdbus-update:
 	( cd $(top_srcdir)/src/libsystemd/ && \
 	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
@@ -5068,9 +5072,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