X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=09a827b02f161a6e604cf08a2569af0d758088cf;hp=8bef21bda34d1aeaffa7f4bc4bc408522ab4a046;hb=36e0e6311bb4df37385db19b5eca03973b26b5ff;hpb=15e913230c652ace36abfbf2b6fed0c1f56b8711 diff --git a/Makefile.am b/Makefile.am index 8bef21bda..09a827b02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,7 @@ LIBGUDEV_REVISION=3 LIBGUDEV_AGE=1 LIBSYSTEMD_LOGIN_CURRENT=9 -LIBSYSTEMD_LOGIN_REVISION=1 +LIBSYSTEMD_LOGIN_REVISION=2 LIBSYSTEMD_LOGIN_AGE=9 LIBSYSTEMD_DAEMON_CURRENT=0 @@ -52,16 +52,16 @@ LIBSYSTEMD_DAEMON_REVISION=10 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=26 +LIBSYSTEMD_ID128_REVISION=27 LIBSYSTEMD_ID128_AGE=0 LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=3 LIBSYSTEMD_JOURNAL_AGE=11 -LIBSYSTEMD_BUS_CURRENT=0 -LIBSYSTEMD_BUS_REVISION=0 -LIBSYSTEMD_BUS_AGE=0 +LIBSYSTEMD_CURRENT=0 +LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_AGE=0 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -145,6 +145,10 @@ TESTS = endif udevlibexec_PROGRAMS = +.PHONY: $(INSTALL_EXEC_HOOKS) $(UNINSTALL_EXEC_HOOKS) \ + $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \ + $(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS) + AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \ @@ -189,8 +193,9 @@ 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/sd-bus \ + -I $(top_srcdir)/src/libsystemd/sd-event \ + -I $(top_srcdir)/src/libsystemd/sd-rtnl \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) @@ -221,6 +226,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 +235,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 +469,7 @@ nodist_systemunit_DATA = \ units/systemd-nspawn@.service dist_userunit_DATA = \ + units/user/basic.target \ units/user/default.target \ units/user/exit.target @@ -508,7 +518,8 @@ CLEANFILES += \ units/console-shell.service.m4 \ units/console-getty.service.m4 \ units/container-getty@.service.m4 \ - units/rescue.service.m4 + units/rescue.service.m4 \ + units/user@.service.m4 if HAVE_SYSV_COMPAT nodist_systemunit_DATA += \ @@ -551,7 +562,7 @@ MANPAGES_ALIAS = include Makefile-man.am -.PHONY: man +.PHONY: man update-man-list man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS) XML_FILES = \ @@ -599,16 +610,16 @@ XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml) NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES)) SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES)) -update-man-list: make-man-rules.py $(XML_GLOB) +update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am @echo "Makefile-man.am has been regenerated" -man/systemd.index.xml: make-man-index.py $(NON_INDEX_XML_FILES) +man/systemd.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES) $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^) -man/systemd.directives.xml: make-directive-index.py $(SOURCE_XML_FILES) +man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE_XML_FILES) $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^) @@ -630,34 +641,10 @@ EXTRA_DIST += \ $(HTML_FILES) \ $(HTML_ALIAS) \ $(man_MANS) \ - make-man-index.py \ - 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 + tools/make-man-index.py \ + tools/make-directive-index.py \ + tools/make-man-rules.py \ + tools/xml_helper.py # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -694,6 +681,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/time-util.h \ src/shared/hashmap.c \ src/shared/hashmap.h \ + src/shared/siphash24.c \ + src/shared/siphash24.h \ src/shared/set.c \ src/shared/set.h \ src/shared/fdset.c \ @@ -753,8 +742,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/fileio.c \ src/shared/fileio.h \ src/shared/output-mode.h \ - src/shared/MurmurHash3.c \ - src/shared/MurmurHash3.h \ + src/shared/MurmurHash2.c \ + src/shared/MurmurHash2.h \ src/shared/acpi-fpdt.h \ src/shared/acpi-fpdt.c \ src/shared/boot-timestamps.h \ @@ -776,7 +765,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/syscall-list.c \ src/shared/syscall-list.h \ src/shared/audit.c \ - src/shared/audit.h + src/shared/audit.h \ + src/shared/xml.c \ + src/shared/xml.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -1013,12 +1004,10 @@ libsystemd_core_la_LIBADD = \ libsystemd-capability.la \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-id128-internal.la \ 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) \ @@ -1138,6 +1127,7 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-tmpfiles \ test-namespace \ test-date \ test-sleep \ @@ -1153,7 +1143,8 @@ tests += \ test-hashmap \ test-list \ test-tables \ - test-device-nodes + test-device-nodes \ + test-xml EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1243,6 +1234,12 @@ test_util_SOURCES = \ test_util_LDADD = \ libsystemd-core.la +test_tmpfiles_SOURCES = \ + src/test/test-tmpfiles.c + +test_tmpfiles_LDADD = \ + libsystemd-shared.la + test_namespace_SOURCES = \ src/test/test-namespace.c @@ -1255,6 +1252,12 @@ test_hashmap_SOURCES = \ test_hashmap_LDADD = \ libsystemd-core.la +test_xml_SOURCES = \ + src/test/test-xml.c + +test_xml_LDADD = \ + libsystemd-shared.la + test_list_SOURCES = \ src/test/test-list.c @@ -1381,7 +1384,7 @@ test_strv_SOURCES = \ test_strv_LDADD = \ libsystemd-units.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la test_path_util_SOURCES = \ @@ -1402,7 +1405,7 @@ test_install_SOURCES = \ test_install_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la test_watchdog_SOURCES = \ @@ -1424,7 +1427,7 @@ test_sched_prio_LDADD = \ # ------------------------------------------------------------------------------ ## .PHONY so it always rebuilds it -.PHONY: coverage lcov-run lcov-report +.PHONY: coverage lcov-run lcov-report coverage-sync # run lcov from scratch, always coverage: @@ -1465,8 +1468,7 @@ systemd_analyze_SOURCES = \ src/analyze/analyze.c systemd_analyze_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1475,8 +1477,7 @@ systemd_initctl_SOURCES = \ src/initctl/initctl.c systemd_initctl_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1489,8 +1490,7 @@ systemd_update_utmp_CFLAGS = \ $(AUDIT_CFLAGS) systemd_update_utmp_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ $(AUDIT_LIBS) @@ -1566,7 +1566,7 @@ systemd_tmpfiles_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ libsystemd-capability.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la rootbin_PROGRAMS += \ @@ -1582,6 +1582,7 @@ nodist_systemunit_DATA += \ dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ + tmpfiles.d/systemd-nologin.conf \ tmpfiles.d/tmp.conf \ tmpfiles.d/x11.conf @@ -1618,7 +1619,7 @@ systemd_machine_id_setup_SOURCES = \ systemd_machine_id_setup_LDADD = \ libsystemd-label.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -1640,8 +1641,7 @@ systemd_fsck_SOURCES = \ src/fsck/fsck.c systemd_fsck_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -1721,7 +1721,7 @@ bootctl_SOURCES = \ bootctl_LDADD = \ libsystemd-shared.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la bin_PROGRAMS += \ @@ -1742,7 +1742,7 @@ systemd_gpt_auto_generator_SOURCES = \ systemd_gpt_auto_generator_LDADD = \ libsystemd-label.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) @@ -1753,6 +1753,7 @@ systemd_gpt_auto_generator_CFLAGS = \ endif # ------------------------------------------------------------------------------ +if ENABLE_KDBUS systemgenerator_PROGRAMS += \ systemd-dbus1-generator @@ -1762,7 +1763,17 @@ 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 +endif # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ @@ -1787,8 +1798,7 @@ systemd_cgroups_agent_SOURCES = \ src/cgroups-agent/cgroups-agent.c systemd_cgroups_agent_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1799,17 +1809,9 @@ systemctl_SOURCES = \ systemctl_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-bus-internal.la \ - libsystemd-logs.la - -if ENABLE_LOGIND -systemctl_LDADD += \ - libsystemd-login-internal.la -endif - -systemctl_LDADD += \ + libsystemd-internal.la \ + libsystemd-logs.la \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1862,11 +1864,9 @@ systemd_nspawn_SOURCES = \ systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-shared.la \ - libsystemd-rtnl.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_run_SOURCES = \ @@ -1875,9 +1875,8 @@ 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 # ------------------------------------------------------------------------------ @@ -1885,13 +1884,12 @@ 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 @@ -1907,10 +1905,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 += \ @@ -1975,114 +1971,134 @@ 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 = \ - libsystemd-id128-internal.la \ + src/systemd/sd-rtnl.h \ + src/systemd/sd-resolve.h \ + src/systemd/sd-login.h \ + src/systemd/sd-id128.h \ + src/libsystemd/sd-bus/sd-bus.c \ + src/libsystemd/sd-bus/bus-control.c \ + src/libsystemd/sd-bus/bus-control.h \ + src/libsystemd/sd-bus/bus-error.c \ + src/libsystemd/sd-bus/bus-error.h \ + src/libsystemd/sd-bus/bus-internal.c \ + src/libsystemd/sd-bus/bus-internal.h \ + src/libsystemd/sd-bus/bus-socket.c \ + src/libsystemd/sd-bus/bus-socket.h \ + src/libsystemd/sd-bus/bus-kernel.c \ + src/libsystemd/sd-bus/bus-kernel.h \ + src/libsystemd/sd-bus/bus-container.c \ + src/libsystemd/sd-bus/bus-container.h \ + src/libsystemd/sd-bus/bus-message.c \ + src/libsystemd/sd-bus/bus-message.h \ + src/libsystemd/sd-bus/bus-creds.c \ + src/libsystemd/sd-bus/bus-creds.h \ + src/libsystemd/sd-bus/bus-signature.c \ + src/libsystemd/sd-bus/bus-signature.h \ + src/libsystemd/sd-bus/bus-type.c \ + src/libsystemd/sd-bus/bus-type.h \ + src/libsystemd/sd-bus/bus-match.c \ + src/libsystemd/sd-bus/bus-match.h \ + src/libsystemd/sd-bus/bus-bloom.c \ + src/libsystemd/sd-bus/bus-bloom.h \ + src/libsystemd/sd-bus/bus-introspect.c \ + src/libsystemd/sd-bus/bus-introspect.h \ + src/libsystemd/sd-bus/bus-objects.c \ + src/libsystemd/sd-bus/bus-objects.h \ + src/libsystemd/sd-bus/bus-gvariant.c \ + src/libsystemd/sd-bus/bus-gvariant.h \ + src/libsystemd/sd-bus/bus-convenience.c \ + src/libsystemd/sd-bus/bus-util.c \ + src/libsystemd/sd-bus/bus-util.h \ + src/libsystemd/sd-bus/bus-protocol.h \ + src/libsystemd/sd-bus/kdbus.h \ + src/libsystemd/sd-bus/sd-memfd.c \ + src/libsystemd/sd-utf8/sd-utf8.c \ + src/libsystemd/sd-event/sd-event.c \ + src/libsystemd/sd-event/event-util.h \ + src/libsystemd/sd-rtnl/sd-rtnl.c \ + src/libsystemd/sd-rtnl/rtnl-internal.h \ + src/libsystemd/sd-rtnl/rtnl-message.c \ + src/libsystemd/sd-rtnl/rtnl-util.h \ + src/libsystemd/sd-rtnl/rtnl-util.c \ + src/libsystemd/sd-resolve/sd-resolve.c \ + src/libsystemd/sd-resolve/resolve-util.h \ + src/libsystemd/sd-id128/sd-id128.c \ + src/login/sd-login.c \ + src/login/login-shared.c \ + src/login/login-shared.h + +nodist_libsystemd_la_SOURCES = \ + src/libsystemd/sd-bus/bus-error-mapping.c + +libsystemd_la_LIBADD = \ libsystemd-daemon-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + -lresolv -libsystemd_bus_la_CFLAGS = \ +libsystemd_la_CFLAGS = \ $(AM_CFLAGS) \ -pthread -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 + -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym pkgconfiglib_DATA += \ - src/libsystemd-bus/libsystemd-bus.pc + src/libsystemd/libsystemd.pc + +pkginclude_HEADERS += \ + src/systemd/sd-login.h \ + src/systemd/sd-id128.h 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/sd-bus/bus-error-mapping.gperf \ + src/libsystemd/sd-bus/DIFFERENCES \ + src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \ + src/libsystemd/libsystemd.pc.in CLEANFILES += \ - src/libsystemd-bus/bus-error-mapping.c + src/libsystemd/sd-bus/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/sd-bus/bus-dump.c \ + src/libsystemd/sd-bus/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 \ @@ -2095,20 +2111,21 @@ tests += \ test-bus-error \ test-bus-creds \ test-bus-gvariant \ - test-event + test-event \ + test-rtnl \ + test-resolve bin_PROGRAMS += \ busctl test_bus_marshal_SOURCES = \ - src/libsystemd-bus/test-bus-marshal.c + src/libsystemd/sd-bus/test-bus-marshal.c test_bus_marshal_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ @@ -2121,40 +2138,46 @@ test_bus_marshal_CFLAGS = \ $(CAP_CFLAGS) test_bus_signature_SOURCES = \ - src/libsystemd-bus/test-bus-signature.c + src/libsystemd/sd-bus/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/sd-bus/test-bus-chat.c test_bus_chat_CFLAGS = \ $(AM_CFLAGS) \ -pthread test_bus_chat_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la + +test_bus_cleanup_SOURCES = \ + src/libsystemd/sd-bus/test-bus-cleanup.c + +test_bus_cleanup_LDADD = \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_server_SOURCES = \ - src/libsystemd-bus/test-bus-server.c + src/libsystemd/sd-bus/test-bus-server.c test_bus_server_CFLAGS = \ $(AM_CFLAGS) \ -pthread test_bus_server_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_objects_SOURCES = \ - src/libsystemd-bus/test-bus-objects.c + src/libsystemd/sd-bus/test-bus-objects.c test_bus_objects_CFLAGS = \ $(AM_CFLAGS) \ @@ -2162,32 +2185,29 @@ test_bus_objects_CFLAGS = \ -pthread test_bus_objects_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-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/sd-bus/test-bus-error.c test_bus_error_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_gvariant_SOURCES = \ - src/libsystemd-bus/test-bus-gvariant.c + src/libsystemd/sd-bus/test-bus-gvariant.c test_bus_gvariant_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(GLIB_LIBS) \ $(CAP_LIBS) @@ -2198,34 +2218,31 @@ test_bus_gvariant_CFLAGS = \ $(CAP_CFLAGS) test_bus_creds_SOURCES = \ - src/libsystemd-bus/test-bus-creds.c + src/libsystemd/sd-bus/test-bus-creds.c test_bus_creds_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-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/sd-bus/test-bus-match.c test_bus_match_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_kernel_SOURCES = \ - src/libsystemd-bus/test-bus-kernel.c + src/libsystemd/sd-bus/test-bus-kernel.c test_bus_kernel_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(CAP_LIBS) @@ -2234,39 +2251,36 @@ test_bus_kernel_CFLAGS = \ $(CAP_CFLAGS) test_bus_kernel_bloom_SOURCES = \ - src/libsystemd-bus/test-bus-kernel-bloom.c + src/libsystemd/sd-bus/test-bus-kernel-bloom.c test_bus_kernel_bloom_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_kernel_benchmark_SOURCES = \ - src/libsystemd-bus/test-bus-kernel-benchmark.c + src/libsystemd/sd-bus/test-bus-kernel-benchmark.c test_bus_kernel_benchmark_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la test_bus_memfd_SOURCES = \ - src/libsystemd-bus/test-bus-memfd.c + src/libsystemd/sd-bus/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/sd-bus/test-bus-zero-copy.c test_bus_zero_copy_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(CAP_LIBS) @@ -2275,30 +2289,49 @@ test_bus_zero_copy_CFLAGS = \ $(CAP_CFLAGS) test_bus_introspect_SOURCES = \ - src/libsystemd-bus/test-bus-introspect.c + src/libsystemd/sd-bus/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/sd-event/test-event.c test_event_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la + +test_rtnl_SOURCES = \ + src/libsystemd/sd-rtnl/test-rtnl.c + +test_rtnl_LDADD = \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la +test_resolve_SOURCES = \ + src/systemd/sd-resolve.h \ + src/libsystemd/sd-resolve/test-resolve.c + +test_resolve_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la \ + -lresolv + +test_resolve_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + busctl_SOURCES = \ - src/libsystemd-bus/busctl.c + src/libsystemd/sd-bus/busctl.c busctl_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus-dump.la \ + libsystemd-dump.la \ libsystemd-capability.la \ $(CAP_LIBS) @@ -2306,6 +2339,50 @@ busctl_CFLAGS = \ $(AM_CFLAGS) \ $(CAP_CFLAGS) +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-dhcp.la + +libsystemd_dhcp_la_SOURCES = \ + src/systemd/sd-dhcp-client.h \ + src/libsystemd-dhcp/sd-dhcp-client.c \ + src/libsystemd-dhcp/dhcp-lease.h \ + src/libsystemd-dhcp/dhcp-lease.c \ + src/libsystemd-dhcp/dhcp-network.c \ + src/libsystemd-dhcp/dhcp-option.c \ + src/libsystemd-dhcp/dhcp-internal.h \ + src/libsystemd-dhcp/dhcp-protocol.h + +libsystemd_dhcp_la_LIBADD = \ + libsystemd-internal.la \ + libsystemd-shared.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-internal.la \ + libsystemd-shared.la + +test_dhcp_client_SOURCES = \ + src/systemd/sd-dhcp-client.h \ + src/libsystemd-dhcp/dhcp-protocol.h \ + src/libsystemd-dhcp/dhcp-internal.h \ + src/libsystemd-dhcp/test-dhcp-client.c + +test_dhcp_client_LDADD = \ + libsystemd-dhcp.la \ + libsystemd-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la + +tests += \ + test-dhcp-option \ + test-dhcp-client + # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC SUBDIRS += \ @@ -2346,7 +2423,6 @@ libudev_la_LDFLAGS = \ libudev_la_LIBADD = \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la pkgconfiglib_DATA += \ @@ -2422,6 +2498,8 @@ dist_udevhwdb_DATA = \ hwdb/20-pci-classes.hwdb \ hwdb/20-usb-vendor-model.hwdb \ hwdb/20-usb-classes.hwdb \ + hwdb/20-sdio-vendor-model.hwdb \ + hwdb/20-sdio-classes.hwdb \ hwdb/20-bluetooth-vendor-product.hwdb \ hwdb/20-acpi-vendor.hwdb \ hwdb/20-OUI.hwdb \ @@ -2528,8 +2606,7 @@ libudev_core_la_LIBADD = \ libudev-internal.la \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - libsystemd-rtnl.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2901,62 +2978,17 @@ udevlibexec_PROGRAMS += \ mtd_probe # ------------------------------------------------------------------------------ -libsystemd_id128_la_SOURCES = \ - src/libsystemd-id128/libsystemd-id128.sym \ - src/libsystemd-id128/sd-id128.c - -libsystemd_id128_la_CFLAGS = \ - $(AM_CFLAGS) \ - -fvisibility=hidden - -libsystemd_id128_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \ - -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym - -libsystemd_id128_la_LIBADD = \ - libsystemd-daemon-internal.la \ - libsystemd-shared.la - -libsystemd_id128_internal_la_SOURCES = \ - $(libsystemd_id128_la_SOURCES) - test_id128_SOURCES = \ src/test/test-id128.c test_id128_LDADD = \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la tests += \ test-id128 -pkginclude_HEADERS += \ - src/systemd/sd-id128.h - -lib_LTLIBRARIES += \ - libsystemd-id128.la - -noinst_LTLIBRARIES += \ - libsystemd-id128-internal.la - -pkgconfiglib_DATA += \ - src/libsystemd-id128/libsystemd-id128.pc - -# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed -libsystemd-id128-install-hook: - libname=libsystemd-id128.so && $(move-to-rootlibdir) - -libsystemd-id128-uninstall-hook: - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so* - -INSTALL_EXEC_HOOKS += libsystemd-id128-install-hook -UNINSTALL_EXEC_HOOKS += libsystemd-id128-uninstall-hook - -EXTRA_DIST += \ - src/libsystemd-id128/libsystemd-id128.pc.in - # ------------------------------------------------------------------------------ rootlibexec_PROGRAMS += \ @@ -2977,7 +3009,7 @@ systemd_journald_SOURCES = \ systemd_journald_LDADD = \ libsystemd-journal-core.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la systemd_cat_SOURCES = \ @@ -2995,7 +3027,7 @@ journalctl_SOURCES = \ journalctl_LDADD = \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-logs.la \ libsystemd-shared.la @@ -3125,7 +3157,7 @@ libsystemd_journal_la_LDFLAGS = \ libsystemd_journal_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la libsystemd_journal_internal_la_SOURCES = \ @@ -3180,14 +3212,9 @@ libsystemd_journal_core_la_LIBADD = \ libsystemd-capability.la \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la -if ENABLE_LOGIND -libsystemd_journal_core_la_LIBADD += \ - libsystemd-login-internal.la -endif - if HAVE_ACL libsystemd_journal_core_la_LIBADD += \ libsystemd-acl.la @@ -3336,9 +3363,8 @@ systemd_journal_gatewayd_SOURCES = \ systemd_journal_gatewayd_LDADD = \ libsystemd-logs.la \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la \ $(MICROHTTPD_LIBS) @@ -3371,9 +3397,8 @@ 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 \ libsystemd-shared.la @@ -3385,12 +3410,8 @@ systemd_coredump_SOURCES = \ systemd_coredump_LDADD = \ libsystemd-journal-internal.la \ libsystemd-label.la \ - libsystemd-shared.la - -if ENABLE_LOGIND -systemd_coredump_LDADD += \ - libsystemd-login-internal.la -endif + libsystemd-shared.la \ + libsystemd-internal.la rootlibexec_PROGRAMS += \ systemd-coredump @@ -3400,7 +3421,7 @@ systemd_coredumpctl_SOURCES = \ systemd_coredumpctl_LDADD = \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la bin_PROGRAMS += \ @@ -3660,8 +3681,7 @@ systemd_hostnamed_SOURCES = \ systemd_hostnamed_LDADD = \ libsystemd-label.la \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3693,8 +3713,7 @@ hostnamectl_SOURCES = \ src/hostname/hostnamectl.c hostnamectl_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3721,8 +3740,7 @@ systemd_bus_driverd_SOURCES = \ src/bus-driverd/bus-driverd.c systemd_bus_driverd_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3738,10 +3756,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 @@ -3750,8 +3777,7 @@ systemd_localed_SOURCES = \ systemd_localed_LDADD = \ libsystemd-label.la \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3786,14 +3812,13 @@ dist_noinst_SCRIPT = \ src/locale/generate-kbd-model-map update-kbd-model-map: src/locale/generate-kbd-model-map - $PYTHON $< > src/locale/kbd-model-map + $PYTHON $< >src/locale/kbd-model-map localectl_SOURCES = \ src/locale/localectl.c localectl_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3808,6 +3833,8 @@ dist_zshcompletion_DATA += \ endif +.PHONY: update-kbd-model-map + polkitpolicy_in_files += \ src/locale/org.freedesktop.locale1.policy.in @@ -3821,8 +3848,7 @@ systemd_timedated_SOURCES = \ systemd_timedated_LDADD = \ libsystemd-label.la \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3858,8 +3884,7 @@ timedatectl_SOURCES = \ src/timedate/timedatectl.c timedatectl_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3898,46 +3923,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 = \ @@ -3959,8 +3944,7 @@ libsystemd_machine_core_la_SOURCES = \ libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -3971,8 +3955,7 @@ machinectl_SOURCES = \ src/machine/machinectl.c machinectl_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4024,7 +4007,7 @@ systemd_networkd_SOURCES = \ src/network/networkd.h \ src/network/networkd.c \ src/network/networkd-link.c \ - src/network/networkd-bridge.c \ + src/network/networkd-netdev.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ @@ -4036,9 +4019,9 @@ nodist_systemd_networkd_SOURCES = \ systemd_networkd_LDADD = \ libudev-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ - libsystemd-rtnl.la \ + libsystemd-internal.la \ + libsystemd-dhcp.la \ + libsystemd-label.la \ libsystemd-shared.la nodist_systemunit_DATA += \ @@ -4051,7 +4034,7 @@ test_network_SOURCES = \ src/network/test-network.c \ src/network/networkd.h \ src/network/networkd-link.c \ - src/network/networkd-bridge.c \ + src/network/networkd-netdev.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ @@ -4060,10 +4043,10 @@ test_network_SOURCES = \ test_network_LDADD = \ libudev-internal.la \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ + libsystemd-dhcp.la \ libsystemd-daemon-internal.la \ - libsystemd-rtnl.la \ + libsystemd-label.la \ libsystemd-shared.la tests += \ @@ -4119,8 +4102,7 @@ libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ - libsystemd-bus-internal.la \ + libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -4150,10 +4132,9 @@ 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 \ libsystemd-daemon-internal.la rootbin_PROGRAMS += \ @@ -4170,8 +4151,7 @@ systemd_inhibit_SOURCES = \ src/login/inhibit.c systemd_inhibit_LDADD = \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4182,23 +4162,22 @@ test_login_SOURCES = \ src/login/test-login.c test_login_LDADD = \ - libsystemd-login-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la test_login_shared_SOURCES = \ src/login/test-login-shared.c test_login_shared_LDADD = \ - libsystemd-login-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la 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 test_login_tables_SOURCES = \ @@ -4215,29 +4194,6 @@ tests += \ test-login-tables \ test-login-shared -libsystemd_login_la_SOURCES = \ - src/login/libsystemd-login.sym \ - src/login/sd-login.c \ - src/systemd/sd-login.h \ - src/login/login-shared.c \ - src/login/login-shared.h - -libsystemd_login_la_CFLAGS = \ - $(AM_CFLAGS) \ - -fvisibility=hidden - -libsystemd_login_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \ - -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym - -libsystemd_login_la_LIBADD = \ - libsystemd-daemon-internal.la \ - libsystemd-shared.la - -libsystemd_login_internal_la_SOURCES = \ - $(libsystemd_login_la_SOURCES) - if HAVE_PAM pam_systemd_la_SOURCES = \ src/login/pam-module.c @@ -4257,8 +4213,7 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-capability.la \ - libsystemd-bus-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ $(PAM_LIBS) @@ -4270,16 +4225,6 @@ dist_pamconf_DATA = \ src/login/systemd-user endif -# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed -libsystemd-login-install-hook: - libname=libsystemd-login.so && $(move-to-rootlibdir) - -libsystemd-login-uninstall-hook: - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so* - -INSTALL_EXEC_HOOKS += libsystemd-login-install-hook -UNINSTALL_EXEC_HOOKS += libsystemd-login-uninstall-hook - nodist_systemunit_DATA += \ units/systemd-logind.service \ units/systemd-user-sessions.service @@ -4297,18 +4242,6 @@ dist_dbuspolicy_DATA += \ dist_pkgsysconf_DATA += \ src/login/logind.conf -pkginclude_HEADERS += \ - src/systemd/sd-login.h - -lib_LTLIBRARIES += \ - libsystemd-login.la - -noinst_LTLIBRARIES += \ - libsystemd-login-internal.la - -pkgconfiglib_DATA += \ - src/login/libsystemd-login.pc - polkitpolicy_files += \ src/login/org.freedesktop.login1.policy @@ -4358,7 +4291,6 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ src/login/logind-gperf.gperf \ - src/login/libsystemd-login.pc.in \ src/login/71-seat.rules.in \ src/login/73-seat-late.rules.in \ units/systemd-logind.service.in \ @@ -4411,7 +4343,7 @@ id128_la_LDFLAGS = \ id128_la_LIBADD = \ $(PYTHON_DEVEL_LIBS) \ - libsystemd-id128.la + libsystemd.la _daemon_la_SOURCES = \ src/python-systemd/_daemon.c \ @@ -4453,7 +4385,7 @@ _reader_la_LDFLAGS = \ _reader_la_LIBADD = \ $(PYTHON_DEVEL_LIBS) \ libsystemd-journal.la \ - libsystemd-id128.la \ + libsystemd.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4476,7 +4408,7 @@ login_la_LDFLAGS = \ login_la_LIBADD = \ $(PYTHON_DEVEL_LIBS) \ libsystemd-journal.la \ - libsystemd-login.la \ + libsystemd.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4512,6 +4444,8 @@ endif CLEAN_LOCAL_HOOKS += clean-sphinx +.PHONY: python-shell destdir-sphinx clean-sphinx clean-python + clean-sphinx: -rm -rf docs/html/python-systemd/ @@ -4520,6 +4454,80 @@ clean-python: -rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao] -rm -f _daemon.la id128.la _journal.la login.la _reader.la +# ------------------------------------------------------------------------------ +if ENABLE_COMPAT_LIBS + +define generate-fake-lib + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/void new_\1(void);\n__asm__(".symver new_\1,\1@LIBSYSTEMD_209");\nstatic void (*resolve_\1(void)) (void) {\n\treturn new_\1;\n}\nvoid \1(void) __attribute__((ifunc("resolve_\1")));\nobsolete_lib(\1,$(notdir $(basename $<)));\n/p' <$< >$@ +endef + +libsystemd_login_la_SOURCES = \ + libsystemd-login.c \ + src/compat-libs/libsystemd-login.sym + +libsystemd_login_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default \ + -imacros $(top_srcdir)/src/compat-libs/linkwarning.h \ + -fno-lto + +libsystemd_login_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym + +libsystemd_login_la_LIBADD = \ + libsystemd.la + +libsystemd_id128_la_SOURCES = \ + libsystemd-id128.c \ + src/compat-libs/libsystemd-id128.sym + +libsystemd_id128_la_CFLAGS = \ + $(libsystemd_login_la_CFLAGS) + +libsystemd_id128_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym + +libsystemd_id128_la_LIBADD = \ + libsystemd.la + +BUILT_SOURCES += \ + libsystemd-login.c \ + libsystemd-id128.c + +libsystemd-%.c: src/compat-libs/libsystemd-%.sym + $(generate-fake-lib) + +lib_LTLIBRARIES += \ + libsystemd-login.la \ + libsystemd-id128.la + +pkgconfiglib_DATA += \ + src/compat-libs/libsystemd-login.pc \ + src/compat-libs/libsystemd-id128.pc + +# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed +compat-lib-install-hook: + libname=libsystemd-login.so && $(move-to-rootlibdir) + libname=libsystemd-id128.so && $(move-to-rootlibdir) + +compat-lib-uninstall-hook: + rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so* + rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so* + +INSTALL_EXEC_HOOKS += compat-lib-install-hook +UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook + +endif + +EXTRA_DIST += \ + src/compat-libs/libsystemd-login.pc.in \ + src/compat-libs/libsystemd-id128.pc.in + # ------------------------------------------------------------------------------ substitutions = \ '|rootlibexecdir=$(rootlibexecdir)|' \ @@ -4607,11 +4615,11 @@ src/%: src/%.m4 $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ units/%: units/%.m4 - $(AM_V_M4)$(MKDIR_P) $(dir $@) + $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ units/user/%: units/%.m4 - $(AM_V_M4)$(MKDIR_P) $(dir $@) + $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ if ENABLE_POLKIT @@ -4845,6 +4853,7 @@ DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc endif +.PHONY: hwdb-update hwdb-update: ( cd $(top_srcdir)/hwdb && \ wget -N http://www.linux-usb.org/usb.ids \ @@ -4853,16 +4862,19 @@ hwdb-update: http://standards.ieee.org/develop/regauth/iab/iab.txt && \ ./ids-update.pl ) +.PHONY: kdbus-update kdbus-update: - ( cd $(top_srcdir)/src/libsystemd-bus/ && \ + ( cd $(top_srcdir)/src/libsystemd/ && \ wget -N https://d-bus.googlecode.com/git/kdbus.h ) +.PHONY: upload upload: all distcheck cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/ scp man/*.html tango:public/systemd-man/ www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd +.PHONY: doc-sync doc-sync: all destdir-sphinx gtkdoc-rebase --html-dir=docs/libudev/html --online rsync -rlv --delete docs/libudev/html/ --omit-dir-times $(www_target)/libudev/ @@ -4871,9 +4883,11 @@ doc-sync: all destdir-sphinx rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/ rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/ +.PHONY: git-tag git-tag: git tag "v$(VERSION)" -m "systemd $(VERSION)" +.PHONY: install-tree install-tree: all rm -rf $(abs_srcdir)/install-tree $(MAKE) install DESTDIR=$(abs_srcdir)/install-tree @@ -4881,10 +4895,14 @@ install-tree: all # Let's run all tests of the test suite, but under valgrind. Let's # exclude the one perl script we have in there +.PHONY: valgrind-tests 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-%: % @@ -4893,6 +4911,7 @@ exported-%: % exported: $(addprefix exported-, $(lib_LTLIBRARIES)) $(AM_V_GEN)cat $^ > $@ +.PHONY: check-api-docs check-api-docs: exported man $(AM_V_GEN)for symbol in `cat exported` ; do \ if test -f $(builddir)/man/$$symbol.html ; then \ @@ -4914,9 +4933,18 @@ CLEANFILES += \ defined \ undefined +.PHONY: check-api-unused check-api-unused: defined undefined exported ( cat exported undefined ) | sort -u | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2- +.PHONY: check-includes +check-includes: $(top_srcdir)/tools/check-includes.pl + $(AM_V_GEN) find * -name '*.[hcS]' -type f -print | sort -u \ + | xargs $(top_srcdir)/tools/check-includes.pl + +EXTRA_DIST += \ + $(top_srcdir)/tools/check-includes.pl + # Stupid test that everything purported to be exported really is define generate-sym-test @@ -4930,10 +4958,11 @@ 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 + src/systemd/sd-utf8.h \ + src/systemd/sd-login.h $(generate-sym-test) test-libsystemd-daemon-sym.c: \ @@ -4942,7 +4971,7 @@ test-libsystemd-daemon-sym.c: \ $(generate-sym-test) test-libsystemd-id128-sym.c: \ - src/libsystemd-id128/libsystemd-id128.sym \ + src/compat-libs/libsystemd-id128.sym \ src/systemd/sd-id128.h $(generate-sym-test) @@ -4952,7 +4981,7 @@ test-libsystemd-journal-sym.c: \ $(generate-sym-test) test-libsystemd-login-sym.c: \ - src/login/libsystemd-login.sym \ + src/compat-libs/libsystemd-login.sym \ src/systemd/sd-login.h $(generate-sym-test) @@ -4961,10 +4990,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 @@ -4992,20 +5021,31 @@ 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) \ - $(test_libsystemd_login_sym_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 \ - test-libsystemd-login-sym \ test-libudev-sym +if ENABLE_COMPAT_LIBS +BUILT_SOURCES += \ + $(test_libsystemd_login_sym_SOURCES) \ + $(test_libsystemd_id128_sym_SOURCES) + +tests += \ + test-libsystemd-login-sym \ + test-libsystemd-id128-sym +endif + +.PHONY: cppcheck cppcheck: - cppcheck --enable=all $(top_srcdir) + cppcheck --enable=all -q $(top_srcdir) + +# Used to extract compile flags for YCM. +print-%: + @echo $($*)