X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=110937781ae8b6f9a54606de3ee602fb6502340e;hb=03ee5c38cb0da193dd08733fb4c0c2809cee6a99;hp=baf661d63f9f37fb94ff2288185a3e72a514b959;hpb=ffcf82d250e95ea0a06a95d7adc72bfad6db51e3;p=elogind.git diff --git a/Makefile.am b/Makefile.am index baf661d63..110937781 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,7 @@ SUBDIRS = . po .PRECIOUS: $(TEST_SUITE_LOG) Makefile LIBUDEV_CURRENT=5 -LIBUDEV_REVISION=0 +LIBUDEV_REVISION=1 LIBUDEV_AGE=4 LIBGUDEV_CURRENT=2 @@ -59,9 +59,9 @@ LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=5 LIBSYSTEMD_JOURNAL_AGE=11 -LIBSYSTEMD_CURRENT=1 +LIBSYSTEMD_CURRENT=2 LIBSYSTEMD_REVISION=0 -LIBSYSTEMD_AGE=1 +LIBSYSTEMD_AGE=2 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -758,8 +758,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/replace-var.h \ src/shared/spawn-polkit-agent.c \ src/shared/spawn-polkit-agent.h \ - src/shared/hwclock.c \ - src/shared/hwclock.h \ + src/shared/clock-util.c \ + src/shared/clock-util.h \ src/shared/time-dst.c \ src/shared/time-dst.h \ src/shared/calendarspec.c \ @@ -805,7 +805,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/ring.c \ src/shared/ring.h \ src/shared/async.c \ - src/shared/async.h + src/shared/async.h \ + src/shared/eventfd-util.c \ + src/shared/eventfd-util.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -1796,9 +1798,6 @@ systemd_detect_virt_SOURCES = \ systemd_detect_virt_LDADD = \ libsystemd-shared.la -systemd-detect-virt-install-hook: - -$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt - INSTALL_EXEC_HOOKS += \ systemd-detect-virt-install-hook @@ -2034,6 +2033,7 @@ systemd_bus_proxyd_SOURCES = \ src/bus-proxyd/bus-proxyd.c systemd_bus_proxyd_LDADD = \ + libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2509,6 +2509,7 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/network-internal.h libsystemd_network_la_LIBADD = \ + libudev-internal.la \ libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la \ @@ -2532,7 +2533,6 @@ test_dhcp_client_SOURCES = \ test_dhcp_client_LDADD = \ libsystemd-network.la \ - libudev-internal.la \ libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -3480,7 +3480,8 @@ bin_PROGRAMS += \ systemd-cat dist_systemunit_DATA += \ - units/systemd-journald.socket + units/systemd-journald.socket \ + units/systemd-journald-dev-log.socket nodist_systemunit_DATA += \ units/systemd-journald.service \ @@ -3496,7 +3497,9 @@ dist_catalog_DATA = \ catalog/systemd.catalog SOCKETS_TARGET_WANTS += \ - systemd-journald.socket + systemd-journald.socket \ + systemd-journald-dev-log.socket + SYSINIT_TARGET_WANTS += \ systemd-journald.service \ systemd-journal-flush.service @@ -4066,7 +4069,6 @@ CLEANFILES += \ systemd_timesyncd_LDADD = \ libsystemd-resolve.la \ libsystemd-network.la \ - libudev-internal.la \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-internal.la \ @@ -4217,8 +4219,8 @@ CLEANFILES += \ src/resolve/resolved-gperf.c systemd_resolved_LDADD = \ + libsystemd-capability.la \ libsystemd-network.la \ - libudev-internal.la \ libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -4256,14 +4258,13 @@ systemd_networkd_SOURCES = \ systemd_networkd_LDADD = \ libsystemd-networkd-core.la \ - $(KMOD_LIBS) + libsystemd-capability.la noinst_LTLIBRARIES += \ libsystemd-networkd-core.la libsystemd_networkd_core_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(KMOD_CFLAGS) + $(AM_CFLAGS) libsystemd_networkd_core_la_SOURCES = \ src/libsystemd-network/network-internal.h \ @@ -4271,6 +4272,7 @@ libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-link.c \ src/network/networkd-netdev.c \ src/network/networkd-tunnel.c \ + src/network/networkd-veth.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ @@ -4291,8 +4293,7 @@ rootlibexec_PROGRAMS += \ systemd-networkd-wait-online systemd_networkd_wait_online_CFLAGS = \ - $(AM_CFLAGS) \ - $(KMOD_CFLAGS) + $(AM_CFLAGS) systemd_networkd_wait_online_SOURCES = \ src/libsystemd-network/network-internal.h \ @@ -4309,12 +4310,10 @@ test_network_SOURCES = \ src/network/test-network.c test_network_CFLAGS = \ - $(AM_CFLAGS) \ - $(KMOD_CFLAGS) + $(AM_CFLAGS) test_network_LDADD = \ libsystemd-networkd-core.la - $(KMOD_LIBS) tests += \ test-network @@ -5324,60 +5323,6 @@ tests += \ test-libsystemd-sym \ test-libudev-sym -if ENABLE_COMPAT_LIBS -test-libsystemd-daemon-sym.c: \ - src/compat-libs/libsystemd-daemon.sym \ - src/systemd/sd-daemon.h - $(generate-sym-test) - -test-libsystemd-id128-sym.c: \ - src/compat-libs/libsystemd-id128.sym \ - src/systemd/sd-id128.h - $(generate-sym-test) - -test-libsystemd-journal-sym.c: \ - src/compat-libs/libsystemd-journal.sym \ - src/systemd/sd-journal.h - $(generate-sym-test) - -test-libsystemd-login-sym.c: \ - src/compat-libs/libsystemd-login.sym \ - src/systemd/sd-login.h - $(generate-sym-test) - -test_libsystemd_daemon_sym_SOURCES = \ - test-libsystemd-daemon-sym.c -test_libsystemd_daemon_sym_LDADD = \ - libsystemd-daemon.la - -test_libsystemd_id128_sym_SOURCES = \ - test-libsystemd-id128-sym.c -test_libsystemd_id128_sym_LDADD = \ - libsystemd-id128.la - -test_libsystemd_journal_sym_SOURCES = \ - test-libsystemd-journal-sym.c -test_libsystemd_journal_sym_LDADD = \ - libsystemd-journal.la - -test_libsystemd_login_sym_SOURCES = \ - test-libsystemd-login-sym.c -test_libsystemd_login_sym_LDADD = \ - libsystemd-login.la - -BUILT_SOURCES += \ - $(test_libsystemd_journal_sym_SOURCES) \ - $(test_libsystemd_login_sym_SOURCES) \ - $(test_libsystemd_id128_sym_SOURCES) \ - $(test_libsystemd_daemon_sym_SOURCES) - -tests += \ - test-libsystemd-journal-sym \ - test-libsystemd-login-sym \ - test-libsystemd-id128-sym \ - test-libsystemd-daemon-sym -endif - .PHONY: cppcheck cppcheck: cppcheck --enable=all -q $(top_srcdir)