chiark / gitweb /
libudev: disable monitor inside a container
[elogind.git] / Makefile.am
index 4007d2a..8bef21b 100644 (file)
@@ -219,6 +219,7 @@ LOCAL_FS_TARGET_WANTS =
 MULTI_USER_TARGET_WANTS =
 SYSINIT_TARGET_WANTS =
 SOCKETS_TARGET_WANTS =
+BUSNAMES_TARGET_WANTS =
 TIMERS_TARGET_WANTS =
 
 SYSTEM_UNIT_ALIASES =
@@ -237,6 +238,7 @@ install-target-wants-hook:
        what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
        what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
        what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
+       what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && $(add-wants)
        what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
        what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
 
@@ -650,10 +652,12 @@ test_rtnl_SOURCES = \
 test_rtnl_LDADD = \
        libsystemd-rtnl.la \
        libsystemd-bus-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-shared.la
 
-tests += test-rtnl
+tests += \
+       test-rtnl
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -794,9 +798,6 @@ libsystemd_units_la_SOURCES = \
        src/shared/specifier.c \
        src/shared/specifier.h
 
-libsystemd_units_la_CFLAGS = \
-       $(AM_CFLAGS)
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-label.la
@@ -1347,10 +1348,9 @@ test_cgroup_LDADD = \
 test_cgroup_mask_SOURCES = \
        src/test/test-cgroup-mask.c
 
-test_cgroup_mask_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+test_cgroup_mask_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -DTEST_DIR=\"$(abs_top_srcdir)/test\"
 
 test_cgroup_mask_LDADD = \
        libsystemd-core.la \
@@ -1414,9 +1414,9 @@ test_watchdog_LDADD = \
 test_sched_prio_SOURCES = \
        src/test/test-sched-prio.c
 
-test_sched_prio_CFLAGS = \
-       $(AM_CFLAGS) \
-       -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+test_sched_prio_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -DTEST_DIR=\"$(abs_top_srcdir)/test\"
 
 test_sched_prio_LDADD = \
        libsystemd-core.la \
@@ -1560,11 +1560,10 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
-       src/tmpfiles/tmpfiles.c \
-       src/shared/specifier.c \
-       src/shared/specifier.h
+       src/tmpfiles/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-id128-internal.la \
@@ -1899,6 +1898,24 @@ bus-proxyd-uninstall-hook:
 
 INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
 UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
+
+if ENABLE_KDBUS
+nodist_systemunit_DATA += \
+       units/systemd-bus-proxyd@.service
+
+dist_systemunit_DATA += \
+       units/systemd-bus-proxyd.socket
+
+dist_userunit_DATA += \
+       units/user/systemd-bus-proxyd.socket
+
+USER_UNIT_ALIASES += \
+       $(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service
+endif
+
+EXTRA_DIST += \
+       units/systemd-bus-proxyd@.service.in
+
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
        src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -1995,6 +2012,8 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-introspect.h \
        src/libsystemd-bus/bus-objects.c \
        src/libsystemd-bus/bus-objects.h \
+       src/libsystemd-bus/bus-gvariant.c \
+       src/libsystemd-bus/bus-gvariant.h \
        src/libsystemd-bus/bus-convenience.c \
        src/libsystemd-bus/kdbus.h \
        src/libsystemd-bus/sd-memfd.c \
@@ -2002,7 +2021,11 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-util.h \
        src/libsystemd-bus/sd-utf8.c \
        src/libsystemd-bus/sd-event.c \
-       src/libsystemd-bus/event-util.h
+       src/libsystemd-bus/event-util.h \
+       src/libsystemd-bus/bus-protocol.h
+
+nodist_libsystemd_bus_la_SOURCES = \
+       src/libsystemd-bus/bus-error-mapping.c
 
 libsystemd_bus_la_LIBADD = \
        libsystemd-id128-internal.la \
@@ -2022,7 +2045,13 @@ pkgconfiglib_DATA += \
        src/libsystemd-bus/libsystemd-bus.pc
 
 EXTRA_DIST += \
-       src/libsystemd-bus/libsystemd-bus.pc.in
+       src/libsystemd-bus/bus-error-mapping.gperf \
+       src/libsystemd-bus/libsystemd-bus.pc.in \
+       src/libsystemd-bus/DIFFERENCES \
+       src/libsystemd-bus/GVARIANT-SERIALIZATION
+
+CLEANFILES += \
+       src/libsystemd-bus/bus-error-mapping.c
 
 lib_LTLIBRARIES += \
        libsystemd-bus.la
@@ -2030,6 +2059,9 @@ lib_LTLIBRARIES += \
 libsystemd_bus_internal_la_SOURCES = \
        $(libsystemd_bus_la_SOURCES)
 
+nodist_libsystemd_bus_internal_la_SOURCES = \
+       $(nodist_libsystemd_bus_la_SOURCES)
+
 libsystemd_bus_internal_la_CFLAGS = \
        $(libsystemd_bus_la_CFLAGS)
 
@@ -2041,7 +2073,7 @@ libsystemd_bus_dump_la_SOURCES = \
        src/libsystemd-bus/bus-dump.h
 
 libsystemd_bus_dump_la_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
        $(CAP_CFLAGS)
 
 noinst_LTLIBRARIES += \
@@ -2062,6 +2094,7 @@ tests += \
        test-bus-objects \
        test-bus-error \
        test-bus-creds \
+       test-bus-gvariant \
        test-event
 
 bin_PROGRAMS += \
@@ -2146,6 +2179,24 @@ test_bus_error_LDADD = \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
+test_bus_gvariant_SOURCES = \
+       src/libsystemd-bus/test-bus-gvariant.c
+
+test_bus_gvariant_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la \
+       libsystemd-bus-dump.la \
+       libsystemd-capability.la \
+       $(GLIB_LIBS) \
+       $(CAP_LIBS)
+
+test_bus_gvariant_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(GLIB_CFLAGS)
+       $(CAP_CFLAGS)
+
 test_bus_creds_SOURCES = \
        src/libsystemd-bus/test-bus-creds.c
 
@@ -2925,7 +2976,9 @@ systemd_journald_SOURCES = \
        src/journal/journald-server.h
 
 systemd_journald_LDADD = \
-       libsystemd-journal-core.la
+       libsystemd-journal-core.la \
+       libsystemd-bus-internal.la \
+       libsystemd-shared.la
 
 systemd_cat_SOURCES = \
        src/journal/cat.c
@@ -3032,8 +3085,8 @@ test_mmap_cache_LDADD = \
 test_catalog_SOURCES = \
        src/journal/test-catalog.c
 
-test_catalog_CFLAGS = \
-       $(AM_CFLAGS) \
+test_catalog_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
        -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
 
 test_catalog_LDADD = \
@@ -3248,9 +3301,9 @@ pkgconfiglib_DATA += \
        src/journal/libsystemd-journal.pc
 
 dist_catalog_DATA = \
-       catalog/systemd-fr.catalog \
-       catalog/systemd-ru.catalog \
-       catalog/systemd-it.catalog \
+       catalog/systemd.fr.catalog \
+       catalog/systemd.ru.catalog \
+       catalog/systemd.it.catalog \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
@@ -3291,9 +3344,12 @@ systemd_journal_gatewayd_LDADD = \
 
 systemd_journal_gatewayd_CFLAGS = \
        $(AM_CFLAGS) \
-       -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
        $(MICROHTTPD_CFLAGS)
 
+systemd_journal_gatewayd_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
+
 dist_systemunit_DATA += \
        units/systemd-journal-gatewayd.socket
 
@@ -3615,6 +3671,9 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
        units/systemd-hostnamed.service
 
+dist_systemunit_DATA += \
+       units/org.freedesktop.hostname1.busname
+
 dist_dbuspolicy_DATA += \
        src/hostname/org.freedesktop.hostname1.conf
 
@@ -3627,6 +3686,9 @@ polkitpolicy_files += \
 SYSTEM_UNIT_ALIASES += \
        systemd-hostnamed.service dbus-org.freedesktop.hostname1.service
 
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.hostname1.busname
+
 hostnamectl_SOURCES = \
        src/hostname/hostnamectl.c
 
@@ -3654,6 +3716,34 @@ EXTRA_DIST += \
        units/systemd-hostnamed.service.in
 
 # ------------------------------------------------------------------------------
+if ENABLE_KDBUS
+systemd_bus_driverd_SOURCES = \
+       src/bus-driverd/bus-driverd.c
+
+systemd_bus_driverd_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
+
+rootlibexec_PROGRAMS += \
+       systemd-bus-driverd
+
+nodist_systemunit_DATA += \
+       units/systemd-bus-driverd.service
+
+dist_systemunit_DATA += \
+       units/org.freedesktop.DBus.busname
+
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.DBus.busname
+
+endif
+
+EXTRA_DIST += \
+       units/systemd-bus-driverd.service.in
+
+# ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
        src/locale/localed.c
@@ -3668,6 +3758,9 @@ systemd_localed_LDADD = \
 nodist_systemunit_DATA += \
        units/systemd-localed.service
 
+dist_systemunit_DATA += \
+       units/org.freedesktop.locale1.busname
+
 rootlibexec_PROGRAMS += \
        systemd-localed
 
@@ -3683,6 +3776,9 @@ polkitpolicy_files += \
 SYSTEM_UNIT_ALIASES += \
        systemd-localed.service dbus-org.freedesktop.locale1.service
 
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.locale1.busname
+
 dist_pkgdata_DATA += \
        src/locale/kbd-model-map
 
@@ -3742,6 +3838,9 @@ dist_dbuspolicy_DATA += \
 nodist_systemunit_DATA += \
        units/systemd-timedated.service
 
+dist_systemunit_DATA += \
+       units/org.freedesktop.timedate1.busname
+
 polkitpolicy_files += \
        src/timedate/org.freedesktop.timedate1.policy
 
@@ -3752,6 +3851,9 @@ INSTALL_DIRS += \
 SYSTEM_UNIT_ALIASES += \
        systemd-timedated.service dbus-org.freedesktop.timedate1.service
 
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.timedate1.busname
+
 timedatectl_SOURCES = \
        src/timedate/timedatectl.c
 
@@ -3797,6 +3899,46 @@ lib_LTLIBRARIES += \
 endif
 
 # ------------------------------------------------------------------------------
+libsystemd_dhcp_la_SOURCES = \
+       src/systemd/sd-dhcp-client.h \
+       src/libsystemd-dhcp/dhcp-protocol.h \
+       src/libsystemd-dhcp/dhcp-internal.h \
+       src/libsystemd-dhcp/dhcp-network.c \
+       src/libsystemd-dhcp/dhcp-option.c \
+       src/libsystemd-dhcp/dhcp-client.c
+
+noinst_LTLIBRARIES += \
+       libsystemd-dhcp.la
+
+libsystemd_dhcp_la_LIBADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
+test_dhcp_option_SOURCES = \
+       src/libsystemd-dhcp/dhcp-protocol.h \
+       src/libsystemd-dhcp/dhcp-internal.h \
+       src/libsystemd-dhcp/test-dhcp-option.c
+
+test_dhcp_option_LDADD = \
+       libsystemd-dhcp.la \
+       libsystemd-shared.la
+
+test_dhcp_client_SOURCES = \
+       src/libsystemd-dhcp/dhcp-protocol.h \
+       src/systemd/sd-dhcp-client.h \
+       src/libsystemd-dhcp/dhcp-internal.h \
+       src/libsystemd-dhcp/test-dhcp-client.c
+
+test_dhcp_client_LDADD = \
+       libsystemd-dhcp.la \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
+tests += \
+       test-dhcp-option \
+       test-dhcp-client
+
+# ------------------------------------------------------------------------------
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
        src/machine/machined.c \
@@ -3850,7 +3992,8 @@ nodist_systemunit_DATA += \
        units/systemd-machined.service
 
 dist_systemunit_DATA += \
-       units/machine.slice
+       units/machine.slice \
+       units/org.freedesktop.machine1.busname
 
 dist_dbussystemservice_DATA += \
        src/machine/org.freedesktop.machine1.service
@@ -3864,6 +4007,9 @@ dist_zshcompletion_DATA += \
 SYSTEM_UNIT_ALIASES += \
        systemd-machined.service dbus-org.freedesktop.machine1.service
 
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.machine1.busname
+
 EXTRA_DIST += \
        units/systemd-machined.service.in
 
@@ -3916,10 +4062,12 @@ test_network_LDADD = \
        libudev-internal.la \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-rtnl.la \
        libsystemd-shared.la
 
-tests += test-network
+tests += \
+       test-network
 
 EXTRA_DIST += \
        src/network/networkd-gperf.gperf \
@@ -4137,7 +4285,8 @@ nodist_systemunit_DATA += \
        units/systemd-user-sessions.service
 
 dist_systemunit_DATA += \
-       units/user.slice
+       units/user.slice \
+       units/org.freedesktop.login1.busname
 
 dist_dbussystemservice_DATA += \
        src/login/org.freedesktop.login1.service
@@ -4173,6 +4322,9 @@ MULTI_USER_TARGET_WANTS += \
 SYSTEM_UNIT_ALIASES += \
        systemd-logind.service dbus-org.freedesktop.login1.service
 
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.login1.busname
+
 if ENABLE_MULTI_SEAT_X
 
 systemd_multi_seat_x_SOURCES = \
@@ -4675,7 +4827,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
        --with-rootprefix=$$dc_install_base \
-       --disable-split-usr
+       --disable-split-usr \
+       --enable-kdbus
 
 if HAVE_SYSV_COMPAT
 DISTCHECK_CONFIGURE_FLAGS += \
@@ -4853,3 +5006,6 @@ tests += \
        test-libsystemd-journal-sym \
        test-libsystemd-login-sym \
        test-libudev-sym
+
+cppcheck:
+       cppcheck --enable=all $(top_srcdir)