X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=6c7d6e54d671ee6a32f93707bd1dea99732d8117;hp=2cb0f2aea2d970bdc6e042e02b795e88f7f19839;hb=d8e538ecd9e62f841242f07e3df5c835c1ba6313;hpb=7f8aa67131cfc03ddcbd31c0420754864fc122f0

diff --git a/Makefile.am b/Makefile.am
index 2cb0f2aea..6c7d6e54d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,9 +59,9 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
-LIBSYSTEMD_CURRENT=0
-LIBSYSTEMD_REVISION=2
-LIBSYSTEMD_AGE=0
+LIBSYSTEMD_CURRENT=1
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=1
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -1172,10 +1172,12 @@ manual_tests += \
 	test-hostname \
 	test-daemon \
 	test-cgroup \
+	test-cgroup-mask \
 	test-install \
 	test-watchdog \
 	test-log \
-	test-ipcrm
+	test-ipcrm \
+	test-rtnl-manual
 
 tests += \
 	test-job-type \
@@ -1198,7 +1200,6 @@ tests += \
 	test-calendarspec \
 	test-strip-tab-ansi \
 	test-cgroup-util \
-	test-cgroup-mask \
 	test-prioq \
 	test-fileio \
 	test-time \
@@ -1398,6 +1399,14 @@ test_ipcrm_LDADD = \
 	libsystemd-shared.la \
 	-lrt
 
+test_rtnl_manual_SOURCES = \
+	src/test/test-rtnl-manual.c
+
+test_rtnl_manual_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	-lkmod
+
 test_ellipsize_SOURCES = \
 	src/test/test-ellipsize.c
 
@@ -2098,10 +2107,10 @@ 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-resolve/sd-resolve.c \
-	src/libsystemd/sd-resolve/resolve-util.h \
 	src/libsystemd/sd-id128/sd-id128.c \
 	src/libsystemd/sd-daemon/sd-daemon.c \
 	src/libsystemd/sd-login/sd-login.c
@@ -2117,8 +2126,17 @@ libsystemd_internal_la_CFLAGS = \
 libsystemd_internal_la_LIBADD = \
 	$(RT_LIBS)
 
+libsystemd_resolve_la_SOURCES = \
+	src/libsystemd/sd-resolve/sd-resolve.c \
+	src/libsystemd/sd-resolve/resolve-util.h
+
+libsystemd_resolve_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-pthread
+
 noinst_LTLIBRARIES += \
-	libsystemd-internal.la
+	libsystemd-internal.la \
+	libsystemd-resolve.la
 
 libsystemd_dump_la_SOURCES = \
 	src/libsystemd/sd-bus/bus-dump.c \
@@ -2147,6 +2165,7 @@ BUILT_SOURCES += \
 
 libsystemd_la_SOURCES = \
 	$(libsystemd_internal_la_SOURCES) \
+	$(libsystemd_resolve_la_SOURCES) \
 	$(libsystemd_journal_internal_la_SOURCES)
 
 nodist_libsystemd_la_SOURCES = \
@@ -2411,6 +2430,7 @@ test_resolve_SOURCES = \
 
 test_resolve_LDADD = \
 	libsystemd-internal.la \
+	libsystemd-resolve.la \
 	libsystemd-shared.la \
 	-lresolv
 
@@ -3510,8 +3530,8 @@ systemd_coredump_SOURCES = \
 systemd_coredump_LDADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-label.la \
-	libsystemd-shared.la \
-	libsystemd-internal.la
+	libsystemd-internal.la \
+	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
 	systemd-coredump
@@ -3848,21 +3868,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 += \
@@ -5015,6 +5037,11 @@ DISTCHECK_CONFIGURE_FLAGS += \
 	--enable-gtk-doc
 endif
 
+# check "broken" platforms limited toolchains for link breakage before we release
+.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:
 	( cd $(top_srcdir)/hwdb && \
@@ -5029,13 +5056,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
@@ -5045,9 +5074,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