X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=09547d32d3d84bc421faa2c2fd9612565bedc136;hp=53707d999e34ba980f7593368e022ec42b24d160;hb=21ac6ff143cc8bebfbd1818af28e8c6f82cd5265;hpb=0bba8d6eb74466bc708a4453130b99b5b4e0254c diff --git a/Makefile.am b/Makefile.am index 53707d999..09547d32d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,7 +52,7 @@ 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 @@ -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)\" \ @@ -558,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 = \ @@ -606,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 $<,$^) @@ -637,9 +641,10 @@ EXTRA_DIST += \ $(HTML_FILES) \ $(HTML_ALIAS) \ $(man_MANS) \ - make-man-index.py \ - make-directive-index.py \ - xml_helper.py + tools/make-man-index.py \ + tools/make-directive-index.py \ + tools/make-man-rules.py \ + tools/xml_helper.py # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -999,7 +1004,6 @@ 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 \ @@ -1123,6 +1127,7 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-tmpfiles \ test-namespace \ test-date \ test-sleep \ @@ -1229,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 @@ -1373,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 = \ @@ -1394,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 = \ @@ -1416,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: @@ -1458,7 +1469,6 @@ systemd_analyze_SOURCES = \ systemd_analyze_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1468,7 +1478,6 @@ systemd_initctl_SOURCES = \ systemd_initctl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1482,7 +1491,6 @@ systemd_update_utmp_CFLAGS = \ systemd_update_utmp_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ $(AUDIT_LIBS) @@ -1558,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 += \ @@ -1611,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 # ------------------------------------------------------------------------------ @@ -1634,7 +1642,6 @@ systemd_fsck_SOURCES = \ systemd_fsck_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -1714,7 +1721,7 @@ bootctl_SOURCES = \ bootctl_LDADD = \ libsystemd-shared.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-daemon-internal.la bin_PROGRAMS += \ @@ -1735,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) @@ -1792,7 +1799,6 @@ systemd_cgroups_agent_SOURCES = \ systemd_cgroups_agent_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1806,7 +1812,6 @@ systemctl_LDADD = \ libsystemd-internal.la \ libsystemd-logs.la \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1860,7 +1865,6 @@ systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -1873,7 +1877,6 @@ systemd_run_LDADD = \ libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -1883,7 +1886,6 @@ systemd_bus_proxyd_SOURCES = \ systemd_bus_proxyd_LDADD = \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la bus-proxyd-install-hook: @@ -1980,6 +1982,7 @@ libsystemd_la_SOURCES = \ 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 \ @@ -2027,6 +2030,7 @@ libsystemd_la_SOURCES = \ 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 @@ -2035,14 +2039,13 @@ nodist_libsystemd_la_SOURCES = \ src/libsystemd/sd-bus/bus-error-mapping.c libsystemd_la_LIBADD = \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + -lresolv libsystemd_la_CFLAGS = \ $(AM_CFLAGS) \ - -pthread \ - -lresolv + -pthread libsystemd_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -2052,6 +2055,10 @@ libsystemd_la_LDFLAGS = \ pkgconfiglib_DATA += \ src/libsystemd/libsystemd.pc +pkginclude_HEADERS += \ + src/systemd/sd-login.h \ + src/systemd/sd-id128.h + EXTRA_DIST += \ src/libsystemd/sd-bus/bus-error-mapping.gperf \ src/libsystemd/sd-bus/DIFFERENCES \ @@ -2116,7 +2123,6 @@ test_bus_marshal_SOURCES = \ test_bus_marshal_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2147,7 +2153,6 @@ test_bus_chat_CFLAGS = \ test_bus_chat_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2156,7 +2161,6 @@ test_bus_cleanup_SOURCES = \ test_bus_cleanup_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2169,7 +2173,6 @@ test_bus_server_CFLAGS = \ test_bus_server_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2183,7 +2186,6 @@ test_bus_objects_CFLAGS = \ test_bus_objects_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2195,7 +2197,6 @@ test_bus_error_SOURCES = \ test_bus_error_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2204,7 +2205,6 @@ test_bus_gvariant_SOURCES = \ test_bus_gvariant_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2222,7 +2222,6 @@ test_bus_creds_SOURCES = \ test_bus_creds_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2233,7 +2232,6 @@ test_bus_match_SOURCES = \ test_bus_match_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2242,7 +2240,6 @@ test_bus_kernel_SOURCES = \ test_bus_kernel_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2258,7 +2255,6 @@ test_bus_kernel_bloom_SOURCES = \ test_bus_kernel_bloom_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2267,7 +2263,6 @@ test_bus_kernel_benchmark_SOURCES = \ test_bus_kernel_benchmark_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2283,7 +2278,6 @@ test_bus_zero_copy_SOURCES = \ test_bus_zero_copy_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2306,7 +2300,6 @@ test_event_SOURCES = \ test_event_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -2316,7 +2309,6 @@ test_rtnl_SOURCES = \ test_rtnl_LDADD = \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la test_resolve_SOURCES = \ @@ -2325,7 +2317,8 @@ test_resolve_SOURCES = \ test_resolve_LDADD = \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + -lresolv test_resolve_CFLAGS = \ $(AM_CFLAGS) \ @@ -2336,7 +2329,6 @@ busctl_SOURCES = \ busctl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ libsystemd-dump.la \ @@ -2354,8 +2346,11 @@ noinst_LTLIBRARIES += \ 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-packet.c \ src/libsystemd-dhcp/dhcp-internal.h \ src/libsystemd-dhcp/dhcp-protocol.h @@ -2383,7 +2378,6 @@ test_dhcp_client_LDADD = \ libsystemd-dhcp.la \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la tests += \ @@ -2430,7 +2424,6 @@ libudev_la_LDFLAGS = \ libudev_la_LIBADD = \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la pkgconfiglib_DATA += \ @@ -2615,7 +2608,6 @@ libudev_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2987,62 +2979,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 += \ @@ -3081,7 +3028,7 @@ journalctl_SOURCES = \ journalctl_LDADD = \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-logs.la \ libsystemd-shared.la @@ -3211,7 +3158,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 = \ @@ -3266,7 +3213,7 @@ 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 HAVE_ACL @@ -3417,7 +3364,6 @@ systemd_journal_gatewayd_SOURCES = \ systemd_journal_gatewayd_LDADD = \ libsystemd-logs.la \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-internal.la \ libsystemd-shared.la \ @@ -3454,7 +3400,6 @@ systemd_socket_proxyd_LDADD = \ libsystemd-logs.la \ libsystemd-internal.la \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3477,7 +3422,7 @@ systemd_coredumpctl_SOURCES = \ systemd_coredumpctl_LDADD = \ libsystemd-journal-internal.la \ - libsystemd-id128-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la bin_PROGRAMS += \ @@ -3738,7 +3683,6 @@ systemd_hostnamed_SOURCES = \ systemd_hostnamed_LDADD = \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3771,7 +3715,6 @@ hostnamectl_SOURCES = \ hostnamectl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3799,7 +3742,6 @@ systemd_bus_driverd_SOURCES = \ systemd_bus_driverd_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3837,7 +3779,6 @@ systemd_localed_SOURCES = \ systemd_localed_LDADD = \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3872,14 +3813,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-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3894,6 +3834,8 @@ dist_zshcompletion_DATA += \ endif +.PHONY: update-kbd-model-map + polkitpolicy_in_files += \ src/locale/org.freedesktop.locale1.policy.in @@ -3908,7 +3850,6 @@ systemd_timedated_SOURCES = \ systemd_timedated_LDADD = \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -3945,7 +3886,6 @@ timedatectl_SOURCES = \ timedatectl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4006,7 +3946,6 @@ libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -4018,7 +3957,6 @@ machinectl_SOURCES = \ machinectl_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4084,7 +4022,6 @@ systemd_networkd_LDADD = \ libsystemd-daemon-internal.la \ libsystemd-internal.la \ libsystemd-dhcp.la \ - libsystemd-id128-internal.la \ libsystemd-label.la \ libsystemd-shared.la @@ -4109,7 +4046,6 @@ test_network_LDADD = \ libudev-internal.la \ libsystemd-internal.la \ libsystemd-dhcp.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-label.la \ libsystemd-shared.la @@ -4167,7 +4103,6 @@ libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -4201,7 +4136,6 @@ loginctl_LDADD = \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la rootbin_PROGRAMS += \ @@ -4219,7 +4153,6 @@ systemd_inhibit_SOURCES = \ systemd_inhibit_LDADD = \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la @@ -4246,7 +4179,6 @@ test_inhibit_SOURCES = \ test_inhibit_LDADD = \ libsystemd-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ libsystemd-shared.la test_login_tables_SOURCES = \ @@ -4283,7 +4215,6 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-capability.la \ libsystemd-internal.la \ - libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ $(PAM_LIBS) @@ -4312,9 +4243,6 @@ dist_dbuspolicy_DATA += \ dist_pkgsysconf_DATA += \ src/login/logind.conf -pkginclude_HEADERS += \ - src/systemd/sd-login.h - polkitpolicy_files += \ src/login/org.freedesktop.login1.policy @@ -4364,7 +4292,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 \ @@ -4417,7 +4344,7 @@ id128_la_LDFLAGS = \ id128_la_LIBADD = \ $(PYTHON_DEVEL_LIBS) \ - libsystemd-id128.la + libsystemd.la _daemon_la_SOURCES = \ src/python-systemd/_daemon.c \ @@ -4459,7 +4386,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 @@ -4518,6 +4445,8 @@ endif CLEAN_LOCAL_HOOKS += clean-sphinx +.PHONY: python-shell destdir-sphinx clean-sphinx clean-python + clean-sphinx: -rm -rf docs/html/python-systemd/ @@ -4527,48 +4456,78 @@ clean-python: -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")));\n/p' <$< >$@ + $(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/login/libsystemd-login.sym + src/compat-libs/libsystemd-login.sym libsystemd_login_la_CFLAGS = \ $(AM_CFLAGS) \ - -fvisibility=default + -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/login/libsystemd-login.sym + -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-login.c \ + libsystemd-id128.c -libsystemd-login.c: src/login/libsystemd-login.sym +libsystemd-%.c: src/compat-libs/libsystemd-%.sym $(generate-fake-lib) lib_LTLIBRARIES += \ - libsystemd-login.la + libsystemd-login.la \ + libsystemd-id128.la pkgconfiglib_DATA += \ - src/login/libsystemd-login.pc + src/compat-libs/libsystemd-login.pc \ + src/compat-libs/libsystemd-id128.pc # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed -libsystemd-login-install-hook: +compat-lib-install-hook: libname=libsystemd-login.so && $(move-to-rootlibdir) + libname=libsystemd-id128.so && $(move-to-rootlibdir) -libsystemd-login-uninstall-hook: +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 -INSTALL_EXEC_HOOKS += libsystemd-login-install-hook -UNINSTALL_EXEC_HOOKS += libsystemd-login-uninstall-hook +endif + +EXTRA_DIST += \ + src/compat-libs/libsystemd-login.pc.in \ + src/compat-libs/libsystemd-id128.pc.in # ------------------------------------------------------------------------------ substitutions = \ @@ -4686,7 +4645,7 @@ if ENABLE_MANPAGES man/custom-entities.ent: $(AM_V_GEN)$(MKDIR_P) $(dir $@) $(AM_V_GEN)(echo '' && \ - echo '$(subst '|,,$(substitutions))))') \ + printf '$(subst '|,\n,$(substitutions))))') \ > $@ # ' DISTCLEANFILES += \ @@ -4694,6 +4653,7 @@ DISTCLEANFILES += \ XSLTPROC_FLAGS = \ --nonet \ + --xinclude \ --stringparam man.output.quietly 1 \ --stringparam funcsynopsis.style ansi \ --stringparam man.authors.section.enabled 0 \ @@ -4895,6 +4855,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 \ @@ -4903,16 +4864,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/ && \ 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/ @@ -4921,9 +4885,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 @@ -4931,6 +4897,7 @@ 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 \ if file $$f | grep -q shell; then \ @@ -4946,6 +4913,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 \ @@ -4967,9 +4935,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 @@ -4996,7 +4973,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) @@ -5006,7 +4983,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) @@ -5048,19 +5025,26 @@ test_libudev_sym_LDADD = \ BUILT_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-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 -q $(top_srcdir)