X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=dcf0bb3bb3fa120799d20b65c740b512e7340502;hp=acf511bc4f8aa8054691af23e63d5a5c593e87b7;hb=294c866023d05162880b056fea5242d25cd9e865;hpb=0461f8cdc1d7b4afee2f2ff40fcaa3c7e26c662c diff --git a/Makefile.am b/Makefile.am index acf511bc4..dcf0bb3bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -652,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 += \ @@ -796,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 @@ -1349,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 \ @@ -1416,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 \ @@ -1562,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 \ @@ -1901,6 +1898,22 @@ bus-proxyd-uninstall-hook: INSTALL_EXEC_HOOKS += bus-proxyd-install-hook UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook + +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 + +EXTRA_DIST += \ + units/systemd-bus-proxyd@.service.in + # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ src/tty-ask-password-agent/tty-ask-password-agent.c @@ -1997,6 +2010,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 \ @@ -2025,7 +2040,9 @@ pkgconfiglib_DATA += \ src/libsystemd-bus/libsystemd-bus.pc EXTRA_DIST += \ - src/libsystemd-bus/libsystemd-bus.pc.in + src/libsystemd-bus/libsystemd-bus.pc.in \ + src/libsystemd-bus/DIFFERENCES \ + src/libsystemd-bus/GVARIANT-SERIALIZATION lib_LTLIBRARIES += \ libsystemd-bus.la @@ -2044,7 +2061,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 += \ @@ -2065,6 +2082,7 @@ tests += \ test-bus-objects \ test-bus-error \ test-bus-creds \ + test-bus-gvariant \ test-event bin_PROGRAMS += \ @@ -2149,6 +2167,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 @@ -2928,7 +2964,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 @@ -3035,8 +3073,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 = \ @@ -3294,9 +3332,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 @@ -3656,6 +3697,20 @@ dist_zshcompletion_DATA += \ endif +if ENABLE_BUS_DRIVERD +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 +endif + polkitpolicy_in_files += \ src/hostname/org.freedesktop.hostname1.policy.in @@ -3817,6 +3872,46 @@ lib_LTLIBRARIES += \ libnss_myhostname.la 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 = \ @@ -3941,10 +4036,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 \ @@ -4883,3 +4980,6 @@ tests += \ test-libsystemd-journal-sym \ test-libsystemd-login-sym \ test-libudev-sym + +cppcheck: + cppcheck --enable=all $(top_srcdir)