X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=72da6677164d9edc92d8bc762eeb593379d3b4b6;hp=bc6fa1a47648e1a1e9775838925087f0f094f76c;hb=c4e6e24255de376965c7f8ae53e16594c2581200;hpb=08bcebf36eb85f5e75b968de8c648e6614cc534b diff --git a/Makefile.am b/Makefile.am index bc6fa1a47..72da66771 100644 --- a/Makefile.am +++ b/Makefile.am @@ -189,8 +189,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/udev \ -I $(top_srcdir)/src/udev/net \ -I $(top_builddir)/src/udev \ - -I $(top_srcdir)/src/libsystemd-bus \ - -I $(top_srcdir)/src/libsystemd-rtnl \ + -I $(top_srcdir)/src/libsystemd \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) @@ -221,6 +220,8 @@ SYSINIT_TARGET_WANTS = SOCKETS_TARGET_WANTS = BUSNAMES_TARGET_WANTS = TIMERS_TARGET_WANTS = +USER_SOCKETS_TARGET_WANTS = +USER_BUSNAMES_TARGET_WANTS = SYSTEM_UNIT_ALIASES = USER_UNIT_ALIASES = @@ -228,23 +229,25 @@ USER_UNIT_ALIASES = GENERAL_ALIASES = install-target-wants-hook: - what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && $(add-wants) - what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && $(add-wants) - what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && $(add-wants) - what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && $(add-wants) - what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && $(add-wants) - what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && $(add-wants) - what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants) - 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) + what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && dir=$(systemunitdir) && $(add-wants) + what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && dir=$(systemunitdir) && $(add-wants) + what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && dir=$(systemunitdir) && $(add-wants) + what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && dir=$(systemunitdir) && $(add-wants) + what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && dir=$(systemunitdir) && $(add-wants) + what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants) + what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants) + what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants) + what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants) + what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants) + what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants) + what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants) + what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants) + what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants) + what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants) define add-wants [ -z "$$what" ] || ( \ - dir=$(DESTDIR)$(systemunitdir)/$$wants.wants && \ + dir=$(DESTDIR)$$dir/$$wants.wants && \ $(MKDIR_P) -m 0755 $$dir && \ cd $$dir && \ rm -f $$what && \ @@ -460,6 +463,7 @@ nodist_systemunit_DATA = \ units/systemd-nspawn@.service dist_userunit_DATA = \ + units/user/basic.target \ units/user/default.target \ units/user/exit.target @@ -489,7 +493,7 @@ EXTRA_DIST += \ units/user/systemd-exit.service.in \ units/systemd-fsck@.service.in \ units/systemd-fsck-root.service.in \ - units/user@.service.m4.in \ + units/user@.service.in \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ @@ -635,31 +639,6 @@ EXTRA_DIST += \ make-directive-index.py \ xml_helper.py -# ------------------------------------------------------------------------------ -noinst_LTLIBRARIES += \ - libsystemd-rtnl.la - -libsystemd_rtnl_la_SOURCES = \ - src/systemd/sd-rtnl.h \ - src/libsystemd-rtnl/sd-rtnl.c \ - src/libsystemd-rtnl/rtnl-internal.h \ - src/libsystemd-rtnl/rtnl-message.c \ - src/libsystemd-rtnl/rtnl-util.h \ - src/libsystemd-rtnl/rtnl-util.c - -test_rtnl_SOURCES = \ - src/libsystemd-rtnl/test-rtnl.c - -test_rtnl_LDADD = \ - libsystemd-rtnl.la \ - libsystemd-bus-internal.la \ - libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ - libsystemd-shared.la - -tests += \ - test-rtnl - # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-shared.la @@ -1022,8 +1001,7 @@ libsystemd_core_la_LIBADD = \ libsystemd-daemon-internal.la \ libudev-internal.la \ libsystemd-shared.la \ - libsystemd-rtnl.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ @@ -1477,7 +1455,7 @@ systemd_analyze_SOURCES = \ src/analyze/analyze.c systemd_analyze_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1487,7 +1465,7 @@ systemd_initctl_SOURCES = \ src/initctl/initctl.c systemd_initctl_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1501,7 +1479,7 @@ systemd_update_utmp_CFLAGS = \ $(AUDIT_CFLAGS) systemd_update_utmp_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ @@ -1653,7 +1631,7 @@ systemd_fsck_SOURCES = \ src/fsck/fsck.c systemd_fsck_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libudev-internal.la \ @@ -1775,7 +1753,16 @@ systemd_dbus1_generator_SOURCES = \ systemd_dbus1_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la \ - libsystemd-bus-internal.la + libsystemd-internal.la + +dbus1-generator-install-hook: + $(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator + +dbus1-generator-uninstall-hook: + rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator + +INSTALL_EXEC_HOOKS += dbus1-generator-install-hook +UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ @@ -1800,7 +1787,7 @@ systemd_cgroups_agent_SOURCES = \ src/cgroups-agent/cgroups-agent.c systemd_cgroups_agent_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1812,7 +1799,7 @@ systemctl_SOURCES = \ systemctl_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-logs.la if ENABLE_LOGIND @@ -1875,11 +1862,10 @@ systemd_nspawn_SOURCES = \ systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-shared.la \ - libsystemd-rtnl.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_run_SOURCES = \ @@ -1888,7 +1874,7 @@ systemd_run_SOURCES = \ systemd_run_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-id128-internal.la \ libsystemd-shared.la @@ -1898,13 +1884,13 @@ systemd_bus_proxyd_SOURCES = \ src/bus-proxyd/bus-proxyd.c systemd_bus_proxyd_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-id128-internal.la \ libsystemd-shared.la bus-proxyd-install-hook: - $(AM_V_LN)$(LN_S) -f ../../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge + $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge bus-proxyd-uninstall-hook: rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge @@ -1920,10 +1906,8 @@ 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 + units/user/systemd-bus-proxyd.socket \ + units/user/systemd-bus-proxyd@.service endif EXTRA_DIST += \ @@ -1988,114 +1972,131 @@ EXTRA_DIST += \ src/libsystemd-daemon/libsystemd-daemon.pc.in # ------------------------------------------------------------------------------ -libsystemd_bus_la_SOURCES = \ - src/libsystemd-bus/libsystemd-bus.sym \ +libsystemd_la_SOURCES = \ + src/libsystemd/libsystemd.sym \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ src/systemd/sd-bus-vtable.h \ src/systemd/sd-memfd.h \ src/systemd/sd-utf8.h \ src/systemd/sd-event.h \ - src/libsystemd-bus/sd-bus.c \ - 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-container.c \ - src/libsystemd-bus/bus-container.h \ - src/libsystemd-bus/bus-message.c \ - src/libsystemd-bus/bus-message.h \ - src/libsystemd-bus/bus-creds.c \ - src/libsystemd-bus/bus-creds.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-match.c \ - src/libsystemd-bus/bus-match.h \ - src/libsystemd-bus/bus-bloom.c \ - src/libsystemd-bus/bus-bloom.h \ - src/libsystemd-bus/bus-introspect.c \ - 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 \ - src/libsystemd-bus/bus-util.c \ - 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/bus-protocol.h - -nodist_libsystemd_bus_la_SOURCES = \ - src/libsystemd-bus/bus-error-mapping.c - -libsystemd_bus_la_LIBADD = \ + src/systemd/sd-dhcp-client.h \ + src/systemd/sd-rtnl.h \ + src/systemd/sd-resolve.h \ + src/libsystemd/sd-bus.c \ + src/libsystemd/bus-control.c \ + src/libsystemd/bus-control.h \ + src/libsystemd/bus-error.c \ + src/libsystemd/bus-error.h \ + src/libsystemd/bus-internal.c \ + src/libsystemd/bus-internal.h \ + src/libsystemd/bus-socket.c \ + src/libsystemd/bus-socket.h \ + src/libsystemd/bus-kernel.c \ + src/libsystemd/bus-kernel.h \ + src/libsystemd/bus-container.c \ + src/libsystemd/bus-container.h \ + src/libsystemd/bus-message.c \ + src/libsystemd/bus-message.h \ + src/libsystemd/bus-creds.c \ + src/libsystemd/bus-creds.h \ + src/libsystemd/bus-signature.c \ + src/libsystemd/bus-signature.h \ + src/libsystemd/bus-type.c \ + src/libsystemd/bus-type.h \ + src/libsystemd/bus-match.c \ + src/libsystemd/bus-match.h \ + src/libsystemd/bus-bloom.c \ + src/libsystemd/bus-bloom.h \ + src/libsystemd/bus-introspect.c \ + src/libsystemd/bus-introspect.h \ + src/libsystemd/bus-objects.c \ + src/libsystemd/bus-objects.h \ + src/libsystemd/bus-gvariant.c \ + src/libsystemd/bus-gvariant.h \ + src/libsystemd/bus-convenience.c \ + src/libsystemd/kdbus.h \ + src/libsystemd/sd-memfd.c \ + src/libsystemd/bus-util.c \ + src/libsystemd/bus-util.h \ + src/libsystemd/sd-utf8.c \ + src/libsystemd/sd-event.c \ + src/libsystemd/event-util.h \ + src/libsystemd/bus-protocol.h \ + src/libsystemd/sd-dhcp-client.c \ + src/libsystemd/dhcp-network.c \ + src/libsystemd/dhcp-option.c \ + src/libsystemd/dhcp-internal.h \ + src/libsystemd/dhcp-protocol.h \ + src/libsystemd/sd-rtnl.c \ + src/libsystemd/rtnl-internal.h \ + src/libsystemd/rtnl-message.c \ + src/libsystemd/rtnl-util.h \ + src/libsystemd/rtnl-util.c \ + src/libsystemd/sd-resolve.c \ + src/libsystemd/resolve-util.h + +nodist_libsystemd_la_SOURCES = \ + src/libsystemd/bus-error-mapping.c + +libsystemd_la_LIBADD = \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la -libsystemd_bus_la_CFLAGS = \ +libsystemd_la_CFLAGS = \ $(AM_CFLAGS) \ - -pthread + -pthread \ + -lresolv -libsystemd_bus_la_LDFLAGS = \ +libsystemd_la_LDFLAGS = \ $(AM_LDFLAGS) \ -version-info $(LIBSYSTEMD_BUS_CURRENT):$(LIBSYSTEMD_BUS_REVISION):$(LIBSYSTEMD_BUS_AGE) \ - -Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-bus.sym + -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym pkgconfiglib_DATA += \ - src/libsystemd-bus/libsystemd-bus.pc + src/libsystemd/libsystemd.pc EXTRA_DIST += \ - src/libsystemd-bus/bus-error-mapping.gperf \ - src/libsystemd-bus/libsystemd-bus.pc.in \ - src/libsystemd-bus/DIFFERENCES \ - src/libsystemd-bus/GVARIANT-SERIALIZATION + src/libsystemd/bus-error-mapping.gperf \ + src/libsystemd/libsystemd.pc.in \ + src/libsystemd/DIFFERENCES \ + src/libsystemd/GVARIANT-SERIALIZATION CLEANFILES += \ - src/libsystemd-bus/bus-error-mapping.c + src/libsystemd/bus-error-mapping.c lib_LTLIBRARIES += \ - libsystemd-bus.la + libsystemd.la -libsystemd_bus_internal_la_SOURCES = \ - $(libsystemd_bus_la_SOURCES) +libsystemd_internal_la_SOURCES = \ + $(libsystemd_la_SOURCES) -nodist_libsystemd_bus_internal_la_SOURCES = \ - $(nodist_libsystemd_bus_la_SOURCES) +nodist_libsystemd_internal_la_SOURCES = \ + $(nodist_libsystemd_la_SOURCES) -libsystemd_bus_internal_la_CFLAGS = \ - $(libsystemd_bus_la_CFLAGS) +libsystemd_internal_la_CFLAGS = \ + $(libsystemd_la_CFLAGS) noinst_LTLIBRARIES += \ - libsystemd-bus-internal.la + libsystemd-internal.la -libsystemd_bus_dump_la_SOURCES = \ - src/libsystemd-bus/bus-dump.c \ - src/libsystemd-bus/bus-dump.h +libsystemd_dump_la_SOURCES = \ + src/libsystemd/bus-dump.c \ + src/libsystemd/bus-dump.h -libsystemd_bus_dump_la_CFLAGS = \ +libsystemd_dump_la_CFLAGS = \ $(AM_CFLAGS) \ $(CAP_CFLAGS) noinst_LTLIBRARIES += \ - libsystemd-bus-dump.la + libsystemd-dump.la tests += \ test-bus-marshal \ test-bus-signature \ test-bus-chat \ + test-bus-cleanup \ test-bus-server \ test-bus-match \ test-bus-kernel \ @@ -2108,20 +2109,24 @@ tests += \ test-bus-error \ test-bus-creds \ test-bus-gvariant \ - test-event + test-event \ + test-dhcp-option \ + test-dhcp-client \ + test-rtnl \ + test-resolve bin_PROGRAMS += \ busctl test_bus_marshal_SOURCES = \ - src/libsystemd-bus/test-bus-marshal.c + src/libsystemd/test-bus-marshal.c test_bus_marshal_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ @@ -2134,40 +2139,49 @@ test_bus_marshal_CFLAGS = \ $(CAP_CFLAGS) test_bus_signature_SOURCES = \ - src/libsystemd-bus/test-bus-signature.c + src/libsystemd/test-bus-signature.c test_bus_signature_LDADD = \ libsystemd-shared.la \ - libsystemd-bus-internal.la + libsystemd-internal.la test_bus_chat_SOURCES = \ - src/libsystemd-bus/test-bus-chat.c + src/libsystemd/test-bus-chat.c test_bus_chat_CFLAGS = \ $(AM_CFLAGS) \ -pthread test_bus_chat_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la + +test_bus_cleanup_SOURCES = \ + src/libsystemd/test-bus-cleanup.c + +test_bus_cleanup_LDADD = \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_server_SOURCES = \ - src/libsystemd-bus/test-bus-server.c + src/libsystemd/test-bus-server.c test_bus_server_CFLAGS = \ $(AM_CFLAGS) \ -pthread test_bus_server_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_objects_SOURCES = \ - src/libsystemd-bus/test-bus-objects.c + src/libsystemd/test-bus-objects.c test_bus_objects_CFLAGS = \ $(AM_CFLAGS) \ @@ -2175,32 +2189,32 @@ test_bus_objects_CFLAGS = \ -pthread test_bus_objects_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(CAP_LIBS) test_bus_error_SOURCES = \ - src/libsystemd-bus/test-bus-error.c + src/libsystemd/test-bus-error.c test_bus_error_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_gvariant_SOURCES = \ - src/libsystemd-bus/test-bus-gvariant.c + src/libsystemd/test-bus-gvariant.c test_bus_gvariant_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(GLIB_LIBS) \ $(CAP_LIBS) @@ -2211,34 +2225,34 @@ test_bus_gvariant_CFLAGS = \ $(CAP_CFLAGS) test_bus_creds_SOURCES = \ - src/libsystemd-bus/test-bus-creds.c + src/libsystemd/test-bus-creds.c test_bus_creds_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la test_bus_match_SOURCES = \ - src/libsystemd-bus/test-bus-match.c + src/libsystemd/test-bus-match.c test_bus_match_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_kernel_SOURCES = \ - src/libsystemd-bus/test-bus-kernel.c + src/libsystemd/test-bus-kernel.c test_bus_kernel_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(CAP_LIBS) @@ -2247,39 +2261,39 @@ test_bus_kernel_CFLAGS = \ $(CAP_CFLAGS) test_bus_kernel_bloom_SOURCES = \ - src/libsystemd-bus/test-bus-kernel-bloom.c + src/libsystemd/test-bus-kernel-bloom.c test_bus_kernel_bloom_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_kernel_benchmark_SOURCES = \ - src/libsystemd-bus/test-bus-kernel-benchmark.c + src/libsystemd/test-bus-kernel-benchmark.c test_bus_kernel_benchmark_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_memfd_SOURCES = \ - src/libsystemd-bus/test-bus-memfd.c + src/libsystemd/test-bus-memfd.c test_bus_memfd_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la test_bus_zero_copy_SOURCES = \ - src/libsystemd-bus/test-bus-zero-copy.c + src/libsystemd/test-bus-zero-copy.c test_bus_zero_copy_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(CAP_LIBS) @@ -2288,30 +2302,72 @@ test_bus_zero_copy_CFLAGS = \ $(CAP_CFLAGS) test_bus_introspect_SOURCES = \ - src/libsystemd-bus/test-bus-introspect.c + src/libsystemd/test-bus-introspect.c test_bus_introspect_LDADD = \ libsystemd-shared.la \ - libsystemd-bus-internal.la + libsystemd-internal.la test_event_SOURCES = \ - src/libsystemd-bus/test-event.c + src/libsystemd/test-event.c test_event_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la + +test_dhcp_option_SOURCES = \ + src/libsystemd/dhcp-protocol.h \ + src/libsystemd/dhcp-internal.h \ + src/libsystemd/test-dhcp-option.c + +test_dhcp_option_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + +test_dhcp_client_SOURCES = \ + src/systemd/sd-dhcp-client.h \ + src/libsystemd/dhcp-protocol.h \ + src/libsystemd/dhcp-internal.h \ + src/libsystemd/test-dhcp-client.c + +test_dhcp_client_LDADD = \ + libsystemd-internal.la \ + libsystemd-daemon-internal.la \ libsystemd-id128-internal.la \ + libsystemd-shared.la + +test_rtnl_SOURCES = \ + src/libsystemd/test-rtnl.c + +test_rtnl_LDADD = \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-shared.la + +test_resolve_SOURCES = \ + src/systemd/sd-resolve.h \ + src/libsystemd/test-resolve.c + +test_resolve_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la +test_resolve_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + busctl_SOURCES = \ - src/libsystemd-bus/busctl.c + src/libsystemd/busctl.c busctl_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(CAP_LIBS) @@ -2543,7 +2599,7 @@ libudev_core_la_LIBADD = \ libudev-internal.la \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - libsystemd-rtnl.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ @@ -2992,7 +3048,7 @@ systemd_journald_SOURCES = \ systemd_journald_LDADD = \ libsystemd-journal-core.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la systemd_cat_SOURCES = \ @@ -3353,7 +3409,7 @@ systemd_journal_gatewayd_LDADD = \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la \ $(MICROHTTPD_LIBS) @@ -3386,7 +3442,7 @@ systemd_socket_proxyd_SOURCES = \ systemd_socket_proxyd_LDADD = \ libsystemd-logs.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ @@ -3675,7 +3731,7 @@ systemd_hostnamed_SOURCES = \ systemd_hostnamed_LDADD = \ libsystemd-label.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3708,7 +3764,7 @@ hostnamectl_SOURCES = \ src/hostname/hostnamectl.c hostnamectl_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3736,7 +3792,7 @@ systemd_bus_driverd_SOURCES = \ src/bus-driverd/bus-driverd.c systemd_bus_driverd_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3753,10 +3809,19 @@ dist_systemunit_DATA += \ BUSNAMES_TARGET_WANTS += \ org.freedesktop.DBus.busname +nodist_userunit_DATA += \ + units/user/systemd-bus-driverd.service + +USER_BUSNAMES_TARGET_WANTS += \ + org.freedesktop.DBus.busname + +USER_UNIT_ALIASES += \ + $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname endif EXTRA_DIST += \ - units/systemd-bus-driverd.service.in + units/systemd-bus-driverd.service.in \ + units/user/systemd-bus-driverd.service.in # ------------------------------------------------------------------------------ if ENABLE_LOCALED @@ -3765,7 +3830,7 @@ systemd_localed_SOURCES = \ systemd_localed_LDADD = \ libsystemd-label.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3807,7 +3872,7 @@ localectl_SOURCES = \ src/locale/localectl.c localectl_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3836,7 +3901,7 @@ systemd_timedated_SOURCES = \ systemd_timedated_LDADD = \ libsystemd-label.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3873,7 +3938,7 @@ timedatectl_SOURCES = \ src/timedate/timedatectl.c timedatectl_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3913,46 +3978,6 @@ 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 = \ @@ -3974,7 +3999,7 @@ libsystemd_machine_core_la_SOURCES = \ libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -3986,7 +4011,7 @@ machinectl_SOURCES = \ src/machine/machinectl.c machinectl_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4051,9 +4076,9 @@ nodist_systemd_networkd_SOURCES = \ systemd_networkd_LDADD = \ libudev-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ - libsystemd-rtnl.la \ + libsystemd-label.la \ libsystemd-shared.la nodist_systemunit_DATA += \ @@ -4075,10 +4100,10 @@ test_network_SOURCES = \ test_network_LDADD = \ libudev-internal.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-rtnl.la \ + libsystemd-label.la \ libsystemd-shared.la tests += \ @@ -4135,7 +4160,7 @@ libsystemd_logind_core_la_LIBADD = \ libsystemd-capability.la \ libsystemd-daemon-internal.la \ libsystemd-id128-internal.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -4165,7 +4190,7 @@ loginctl_SOURCES = \ src/login/sysfs-show.c loginctl_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la \ libsystemd-id128-internal.la \ @@ -4185,7 +4210,7 @@ systemd_inhibit_SOURCES = \ src/login/inhibit.c systemd_inhibit_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4211,7 +4236,7 @@ test_inhibit_SOURCES = \ src/login/test-inhibit.c test_inhibit_LDADD = \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-id128-internal.la \ libsystemd-shared.la @@ -4272,7 +4297,7 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-capability.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ @@ -4869,7 +4894,7 @@ hwdb-update: ./ids-update.pl ) kdbus-update: - ( cd $(top_srcdir)/src/libsystemd-bus/ && \ + ( cd $(top_srcdir)/src/libsystemd/ && \ wget -N https://d-bus.googlecode.com/git/kdbus.h ) upload: all distcheck @@ -4898,8 +4923,11 @@ install-tree: all # exclude the one perl script we have in there valgrind-tests: $(TESTS) $(AM_V_GEN)for f in $(filter-out %.pl, $^); do \ - echo "Running $$f"; \ - libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; \ + if file $$f | grep -q shell; then \ + echo -e "$${x}Skipping non-binary $$f"; else \ + echo -e "$${x}Running $$f"; \ + libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \ + x="\n\n"; \ done exported-%: % @@ -4945,8 +4973,8 @@ define generate-sym-test $(AM_V_at)printf 'return 0; }\n' >> $@ endef -test-libsystemd-bus-sym.c: \ - src/libsystemd-bus/libsystemd-bus.sym \ +test-libsystemd-sym.c: \ + src/libsystemd/libsystemd.sym \ src/systemd/sd-bus.h \ src/systemd/sd-utf8.h $(generate-sym-test) @@ -4976,10 +5004,10 @@ test-libudev-sym.c: \ src/udev/udev.h $(generate-sym-test) -test_libsystemd_bus_sym_SOURCES = \ - test-libsystemd-bus-sym.c -test_libsystemd_bus_sym_LDADD = \ - libsystemd-bus.la +test_libsystemd_sym_SOURCES = \ + test-libsystemd-sym.c +test_libsystemd_sym_LDADD = \ + libsystemd.la test_libsystemd_daemon_sym_SOURCES = \ test-libsystemd-daemon-sym.c @@ -5007,7 +5035,7 @@ test_libudev_sym_LDADD = \ libudev.la BUILT_SOURCES += \ - $(test_libsystemd_bus_sym_SOURCES) \ + $(test_libsystemd_sym_SOURCES) \ $(test_libsystemd_daemon_sym_SOURCES) \ $(test_libsystemd_id128_sym_SOURCES) \ $(test_libsystemd_journal_sym_SOURCES) \ @@ -5015,7 +5043,7 @@ BUILT_SOURCES += \ $(test_libudev_sym_SOURCES) tests += \ - test-libsystemd-bus-sym \ + test-libsystemd-sym \ test-libsystemd-daemon-sym \ test-libsystemd-id128-sym \ test-libsystemd-journal-sym \ @@ -5024,3 +5052,7 @@ tests += \ cppcheck: cppcheck --enable=all -q $(top_srcdir) + +# Used to extract compile flags for YCM. +print-%: + @echo $($*)