X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=eee73e59509966aeb69b30f99cd2df102ed9b982;hp=92bd542767cb2fbd7ea25f1eca79ee56820d7663;hb=b5baa8fe8838870cc2bd7cef0949299f061ae15d;hpb=1a13e31d275430ffba713c8a68ee7f22093c29e0 diff --git a/Makefile.am b/Makefile.am index 92bd54276..eee73e595 100644 --- 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@ @@ -167,6 +167,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/core \ -I $(top_srcdir)/src/libudev \ -I $(top_srcdir)/src/udev \ + -I $(top_srcdir)/src/libsystemd-bus \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) @@ -221,7 +222,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: @@ -239,7 +240,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 @@ -426,6 +427,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 \ @@ -467,6 +469,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 \ @@ -1086,7 +1089,9 @@ noinst_tests += \ test-calendarspec \ test-strip-tab-ansi \ test-cgroup-util \ - test-prioq + test-prioq \ + test-fileio \ + test-time EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1186,6 +1191,24 @@ test_prioq_CFLAGS = \ test_prioq_LDADD = \ libsystemd-core.la +test_fileio_SOURCES = \ + src/test/test-fileio.c + +test_fileio_CFLAGS = \ + $(AM_CFLAGS) + +test_fileio_LDADD = \ + libsystemd-core.la + +test_time_SOURCES = \ + src/test/test-time.c + +test_time_CFLAGS = \ + $(AM_CFLAGS) + +test_time_LDADD = \ + libsystemd-core.la + test_log_SOURCES = \ src/test/test-log.c @@ -1611,7 +1634,9 @@ systemd_stdio_bridge_SOURCES = \ src/stdio-bridge/stdio-bridge.c systemd_stdio_bridge_LDADD = \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-bus.la \ + libsystemd-daemon.la # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ @@ -1666,26 +1691,32 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ libsystemd_bus_la_SOURCES = \ + src/systemd/sd-bus.h \ + src/systemd/sd-bus-protocol.h \ src/libsystemd-bus/sd-bus.c \ - src/libsystemd-bus/sd-bus.h \ - src/libsystemd-bus/sd-bus-protocol.h \ src/libsystemd-bus/bus-control.c \ + src/libsystemd-bus/bus-control.h \ src/libsystemd-bus/bus-error.c \ src/libsystemd-bus/bus-error.h \ src/libsystemd-bus/bus-internal.c \ 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 \ src/libsystemd-bus/bus-signature.h \ src/libsystemd-bus/bus-type.c \ - src/libsystemd-bus/bus-type.h + src/libsystemd-bus/bus-type.h \ + src/libsystemd-bus/bus-match.c \ + src/libsystemd-bus/bus-match.h libsystemd_bus_la_LIBADD = \ libsystemd-id128-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-daemon.la noinst_LTLIBRARIES += \ libsystemd-bus.la @@ -1693,7 +1724,10 @@ noinst_LTLIBRARIES += \ noinst_tests += \ test-bus-marshal \ test-bus-signature \ - test-bus-chat + test-bus-chat \ + test-bus-server \ + test-bus-match \ + test-bus-kernel noinst_PROGRAMS += \ busctl @@ -1731,6 +1765,40 @@ test_bus_chat_LDADD = \ libsystemd-bus.la \ libsystemd-id128-internal.la +test_bus_server_SOURCES = \ + src/libsystemd-bus/test-bus-server.c + +test_bus_server_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + +test_bus_server_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la \ + libsystemd-id128-internal.la + +test_bus_match_SOURCES = \ + src/libsystemd-bus/test-bus-match.c + +test_bus_match_CFLAGS = \ + $(AM_CFLAGS) + +test_bus_match_LDADD = \ + libsystemd-shared.la \ + 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 @@ -1873,11 +1941,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 @@ -1886,6 +1956,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 @@ -2346,6 +2417,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 \ @@ -2437,7 +2509,8 @@ libsystemd_id128_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym libsystemd_id128_la_LIBADD = \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-daemon-internal.la libsystemd_id128_internal_la_SOURCES = \ $(libsystemd_id128_la_SOURCES) @@ -2839,6 +2912,7 @@ systemd_journal_gatewayd_LDADD = \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon.la \ + libsystemd-bus.la \ $(MICROHTTPD_LIBS) systemd_journal_gatewayd_CFLAGS = \ @@ -3498,7 +3572,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 \ @@ -4051,6 +4124,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/