chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
systemd-logind: Fix linking by reordering libraries in LDADD
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 59a3886f1ca3dc27ed709dc2d14ec173639a9483..a9f72c1e15d5e3dc7b332f822b4811313ce1efbf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,28 +32,28 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=4
-LIBSYSTEMD_LOGIN_REVISION=2
-LIBSYSTEMD_LOGIN_AGE=4
+LIBSYSTEMD_LOGIN_CURRENT=5
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=5
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=8
+LIBSYSTEMD_DAEMON_REVISION=9
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=19
+LIBSYSTEMD_ID128_REVISION=20
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=8
-LIBSYSTEMD_JOURNAL_REVISION=2
-LIBSYSTEMD_JOURNAL_AGE=8
+LIBSYSTEMD_JOURNAL_CURRENT=9
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=9
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -124,9 +124,15 @@ dbusinterface_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
-noinst_tests=
-noinst_PROGRAMS = $(noinst_tests)
-TESTS = $(noinst_tests)
+tests=
+manual_tests =
+if ENABLE_TESTS
+noinst_PROGRAMS = $(manual_tests) $(tests)
+TESTS = $(tests)
+else
+noinst_PROGRAMS =
+TESTS =
+endif
 udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
@@ -222,7 +228,7 @@ define add-wants
          $(MKDIR_P) -m 0755 $$dir && \
          cd $$dir && \
          rm -f $$what && \
-         for i in $$what; do ln -s ../$$i . || exit $$? ; done )
+         for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done )
 endef
 
 install-directories-hook:
@@ -240,7 +246,7 @@ define install-aliases
        $(MKDIR_P) /$(DESTDIR)$$dir && \
        while [ -n "$$1" ]; do \
                rm -f $(DESTDIR)$$dir/$$2 && \
-               ln -s $$1 $(DESTDIR)$$dir/$$2 && \
+               $(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \
                shift 2 || exit $$?; \
        done
 endef
@@ -427,6 +433,7 @@ nodist_systemunit_DATA = \
        units/systemd-kexec.service \
        units/systemd-fsck@.service \
        units/systemd-fsck-root.service \
+       units/systemd-static-nodes.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
@@ -468,6 +475,7 @@ EXTRA_DIST += \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
        units/user@.service.in \
+       units/systemd-static-nodes.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
@@ -558,7 +566,7 @@ noinst_DATA += \
 CLEANFILES += \
        man/index.html
 
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml)
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
 
@@ -678,7 +686,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/calendarspec.h \
        src/shared/fileio.c \
        src/shared/fileio.h \
-       src/shared/output-mode.h
+       src/shared/output-mode.h \
+       src/shared/MurmurHash3.c \
+       src/shared/MurmurHash3.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1059,7 +1069,7 @@ CLEANFILES += \
        src/core/org.freedesktop.systemd1.policy.in
 
 # ------------------------------------------------------------------------------
-noinst_PROGRAMS += \
+manual_tests += \
        test-engine \
        test-ns \
        test-loopback \
@@ -1070,7 +1080,7 @@ noinst_PROGRAMS += \
        test-watchdog \
        test-log
 
-noinst_tests += \
+tests += \
        test-job-type \
        test-env-replace \
        test-strbuf \
@@ -1141,7 +1151,7 @@ test_hostname_LDADD = \
        libsystemd-core.la
 
 if ENABLE_EFI
-noinst_PROGRAMS += \
+manual_tests += \
        test-efivars
 
 test_efivars_SOURCES = \
@@ -1700,6 +1710,8 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-internal.h \
        src/libsystemd-bus/bus-socket.c \
        src/libsystemd-bus/bus-socket.h \
+       src/libsystemd-bus/bus-kernel.c \
+       src/libsystemd-bus/bus-kernel.h \
        src/libsystemd-bus/bus-message.c \
        src/libsystemd-bus/bus-message.h \
        src/libsystemd-bus/bus-signature.c \
@@ -1707,7 +1719,10 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-type.c \
        src/libsystemd-bus/bus-type.h \
        src/libsystemd-bus/bus-match.c \
-       src/libsystemd-bus/bus-match.h
+       src/libsystemd-bus/bus-match.h \
+       src/libsystemd-bus/bus-bloom.c \
+       src/libsystemd-bus/bus-bloom.h \
+       src/libsystemd-bus/kdbus.h
 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \
@@ -1717,12 +1732,13 @@ libsystemd_bus_la_LIBADD =  \
 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 
-noinst_tests += \
+tests += \
        test-bus-marshal \
        test-bus-signature \
        test-bus-chat \
        test-bus-server \
-       test-bus-match
+       test-bus-match \
+       test-bus-kernel
 
 noinst_PROGRAMS += \
        busctl
@@ -1783,6 +1799,17 @@ test_bus_match_LDADD = \
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 
+test_bus_kernel_SOURCES = \
+       src/libsystemd-bus/test-bus-kernel.c
+
+test_bus_kernel_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_kernel_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
 busctl_SOURCES = \
        src/libsystemd-bus/busctl.c
 
@@ -1925,11 +1952,13 @@ CLEANFILES += \
        src/udev/udev.pc
 
 EXTRA_DIST += \
+       units/systemd-static-nodes.service.in \
        units/systemd-udevd.service.in \
        units/systemd-udev-trigger.service.in \
        units/systemd-udev-settle.service.in
 
 CLEANFILES += \
+       units/systemd-static-nodes.service \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service
@@ -1938,6 +1967,7 @@ SOCKETS_TARGET_WANTS += \
        systemd-udevd-control.socket \
        systemd-udevd-kernel.socket
 SYSINIT_TARGET_WANTS += \
+       systemd-static-nodes.service \
        systemd-udevd.service \
        systemd-udev-trigger.service
 
@@ -2050,7 +2080,7 @@ TESTS += \
        test/udev-test.pl \
        test/rules-test.sh
 
-noinst_PROGRAMS += \
+manual_tests += \
        test-libudev \
        test-udev
 
@@ -2398,6 +2428,7 @@ dist_udevkeymap_DATA = \
        keymaps/hewlett-packard-tablet \
        keymaps/hewlett-packard-tx2 \
        keymaps/hewlett-packard_elitebook-8440p \
+       keymaps/hewlett-packard_elitebook-8460p \
        keymaps/hewlett-packard-hdx9494nr \
        keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
        keymaps/inventec-symphony_6.0_7.0 \
@@ -2502,7 +2533,7 @@ test_id128_LDADD = \
        libsystemd-shared.la \
        libsystemd-id128-internal.la
 
-noinst_tests += \
+tests += \
        test-id128
 
 pkginclude_HEADERS += \
@@ -2810,10 +2841,10 @@ catalog-remove-hook:
 UNINSTALL_DATA_HOOKS += \
        catalog-remove-hook
 
-noinst_PROGRAMS += \
+manual_tests += \
        test-journal-enum
 
-noinst_tests += \
+tests += \
        test-journal \
        test-journal-send \
        test-journal-syslog \
@@ -3056,7 +3087,8 @@ systemd_bootchart_SOURCES = \
        src/bootchart/svg.h
 
 systemd_bootchart_LDADD = \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-journal.la
 
 rootlibexec_PROGRAMS += \
        systemd-bootchart
@@ -3435,8 +3467,8 @@ systemd_logind_CFLAGS = \
 
 systemd_logind_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
        libsystemd-audit.la \
+       libsystemd-shared.la \
        libsystemd-daemon.la \
        libsystemd-dbus.la \
        libudev.la
@@ -3510,7 +3542,7 @@ test_inhibit_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
-noinst_PROGRAMS += \
+manual_tests += \
        test-login \
        test-inhibit
 
@@ -3552,7 +3584,6 @@ pam_systemd_la_LDFLAGS = \
        -export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
-       libsystemd-daemon.la \
        libsystemd-audit.la \
        libsystemd-dbus.la \
        libsystemd-shared.la \
@@ -4105,6 +4136,10 @@ hwdb-update:
                http://standards.ieee.org/develop/regauth/iab/iab.txt && \
        ./ids-update.pl )
 
+kdbus-update:
+       ( cd $(top_srcdir)/src/libsystemd-bus/ && \
+       wget -N https://d-bus.googlecode.com/git/kdbus.h )
+
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
Unnamed repository; edit this file 'description' to name the repository.