bus-proxyd: do not free NULL items

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index baf661d63f9f37fb94ff2288185a3e72a514b959..ee4ced390de3d2e5fbdf652a7a8d2d90a782c63f 100644 (file)
--- 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@
@@ -549,6 +549,7 @@ nodist_systemunit_DATA += \
        units/halt-local.service
 
 systemgenerator_PROGRAMS += \
+       systemd-sysv-generator \
        systemd-rc-local-generator
 endif
 
@@ -758,8 +759,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 +806,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 +1799,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
 
@@ -1915,6 +1915,15 @@ INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
 UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
 endif
 
+# ------------------------------------------------------------------------------
+systemd_sysv_generator_SOURCES = \
+       src/sysv-generator/sysv-generator.c
+
+systemd_sysv_generator_LDADD = \
+       libsystemd-core.la \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
        src/rc-local-generator/rc-local-generator.c
@@ -2031,9 +2040,12 @@ systemd_run_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_bus_proxyd_SOURCES = \
-       src/bus-proxyd/bus-proxyd.c
+       src/bus-proxyd/bus-proxyd.c \
+       src/bus-proxyd/bus-policy.c \
+       src/bus-proxyd/bus-policy.h
 
 systemd_bus_proxyd_LDADD = \
+       libsystemd-capability.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -2509,6 +2521,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 +2545,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 +3492,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 +3509,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
@@ -3564,7 +3579,8 @@ systemd_socket_proxyd_LDADD = \
        libsystemd-logs.la \
        libsystemd-internal.la \
        libsystemd-journal-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-resolve.la
 
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
@@ -4066,7 +4082,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 +4232,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 +4271,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 +4285,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 +4306,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 +4323,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 +5336,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)