X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e02dede7a139ca159c2ab48ff3b63e6f6a3efc74;hp=71c16cbebb8c21ce61b1693828d192cdb7066992;hb=836cf0905c4a8fe3358d6b0e005192d5ee51d3e2;hpb=f20a35cc0d537dd4cfc1054cf7936b04a1700f3a diff --git a/Makefile.am b/Makefile.am index 71c16cbeb..e02dede7a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -371,7 +371,8 @@ rootlibexec_PROGRAMS = \ systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ - systemd-system-update-generator + systemd-system-update-generator \ + systemd-debug-generator dist_bashcompletion_DATA = \ shell-completion/bash/busctl \ @@ -826,7 +827,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/eventfd-util.c \ src/shared/eventfd-util.h \ src/shared/copy.c \ - src/shared/copy.h + src/shared/copy.h \ + src/shared/base-filesystem.c \ + src/shared/base-filesystem.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -836,7 +839,8 @@ nodist_libsystemd_shared_la_SOURCES = \ libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ - $(SECCOMP_CFLAGS) + $(SECCOMP_CFLAGS) \ + -pthread # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -1242,7 +1246,11 @@ tests += \ test-xml \ test-architecture \ test-socket-util \ - test-fdset + test-fdset \ + test-conf-files \ + test-capability \ + test-async \ + test-ratelimit EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1346,12 +1354,31 @@ test_utf8_SOURCES = \ test_utf8_LDADD = \ libsystemd-shared.la +test_capability_SOURCES = \ + src/test/test-capability.c + +test_capability_LDADD = \ + libsystemd-shared.la \ + libsystemd-capability.la + +test_async_SOURCES = \ + src/test/test-async.c + +test_async_LDADD = \ + libsystemd-shared.la + test_fdset_SOURCES = \ src/test/test-fdset.c test_fdset_LDADD = \ libsystemd-core.la +test_ratelimit_SOURCES = \ + src/test/test-ratelimit.c + +test_ratelimit_LDADD = \ + libsystemd-shared.la + test_util_SOURCES = \ src/test/test-util.c @@ -1599,12 +1626,18 @@ test_sched_prio_LDADD = \ libsystemd-core.la \ $(RT_LIBS) +test_conf_files_SOURCES = \ + src/test/test-conf-files.c + +test_conf_files_LDADD = \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ ## .PHONY so it always rebuilds it .PHONY: coverage lcov-run lcov-report coverage-sync # run lcov from scratch, always -coverage: +coverage: all $(MAKE) lcov-run $(MAKE) lcov-report @@ -1820,6 +1853,9 @@ EXTRA_DIST += \ units/systemd-sysusers.service.in \ sysusers.d/systemd.conf.in +CLEANFILES += \ + sysusers.d/systemd.conf + INSTALL_DIRS += \ $(sysusersdir) endif @@ -1891,6 +1927,14 @@ systemd_getty_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_debug_generator_SOURCES = \ + src/debug-generator/debug-generator.c + +systemd_debug_generator_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_fstab_generator_SOURCES = \ src/fstab-generator/fstab-generator.c \ @@ -2596,12 +2640,17 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/ipv4ll-internal.h \ src/libsystemd-network/network-internal.c \ src/libsystemd-network/network-internal.h \ - src/systemd/sd-dhcp6-client.h \ src/systemd/sd-icmp6-nd.h \ - src/libsystemd-network/sd-dhcp6-client.c \ + src/systemd/sd-dhcp6-client.h \ + src/systemd/sd-dhcp6-lease.h \ src/libsystemd-network/sd-icmp6-nd.c \ + src/libsystemd-network/sd-dhcp6-client.c \ src/libsystemd-network/dhcp6-internal.h \ - src/libsystemd-network/dhcp6-network.c + src/libsystemd-network/dhcp6-protocol.h \ + src/libsystemd-network/dhcp6-network.c \ + src/libsystemd-network/dhcp6-option.c \ + src/libsystemd-network/dhcp6-lease-internal.h \ + src/libsystemd-network/sd-dhcp6-lease.c libsystemd_network_la_LIBADD = \ libudev-internal.la \ @@ -2653,7 +2702,7 @@ test_ipv4ll_LDADD = \ test_icmp6_rs_SOURCES = \ src/systemd/sd-dhcp6-client.h \ - src/libsystemd-network/sd-icmp6-nd.h \ + src/systemd/sd-icmp6-nd.h \ src/libsystemd-network/dhcp6-internal.h \ src/libsystemd-network/test-icmp6-rs.c @@ -2662,12 +2711,23 @@ test_icmp6_rs_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +test_dhcp6_client_SOURCES = \ + src/systemd/sd-dhcp6-client.h \ + src/libsystemd-network/dhcp6-internal.h \ + src/libsystemd-network/test-dhcp6-client.c + +test_dhcp6_client_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la + tests += \ test-dhcp-option \ test-dhcp-client \ test-dhcp-server \ test-ipv4ll \ - test-icmp6-rs + test-icmp6-rs \ + test-dhcp6-client # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC @@ -3129,6 +3189,7 @@ CLEANFILES += \ src/gudev/gudev-1.0.pc libgudev_1_0_la_SOURCES = \ + src/gudev/libgudev-1.0.sym \ src/gudev/gudevenums.h \ src/gudev/gudevenumtypes.h \ src/gudev/gudevenumtypes.h\ @@ -3172,8 +3233,9 @@ libgudev_1_0_la_LIBADD = \ libgudev_1_0_la_LDFLAGS = \ $(AM_LDFLAGS) \ -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \ - -export-dynamic -no-undefined \ - -export-symbols-regex '^g_udev_.*' + -export-dynamic \ + -no-undefined \ + -Wl,--version-script=$(top_srcdir)/src/gudev/libgudev-1.0.sym src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -3447,6 +3509,15 @@ test_catalog_CPPFLAGS = \ test_catalog_LDADD = \ libsystemd-journal-core.la +if HAVE_XZ +test_compress_SOURCES = \ + src/journal/test-compress.c + +test_compress_LDADD = \ + libsystemd-journal-internal.la \ + libsystemd-shared.la +endif + libsystemd_journal_core_la_SOURCES = \ src/journal/journald-kmsg.c \ src/journal/journald-kmsg.h \ @@ -3529,6 +3600,10 @@ tests += \ test-mmap-cache \ test-catalog +if HAVE_XZ +tests += test-compress +endif + pkginclude_HEADERS += \ src/systemd/sd-journal.h \ src/systemd/sd-messages.h \ @@ -3741,6 +3816,9 @@ dist_bashcompletion_DATA += \ dist_zshcompletion_DATA += \ shell-completion/zsh/_coredumpctl +GENERAL_ALIASES += \ + $(bindir)/coredumpctl $(bindir)/systemd-coredumpctl + sysctl_DATA = \ sysctl.d/50-coredump.conf @@ -4223,6 +4301,9 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-timesyncd.service +GENERAL_ALIASES += \ + $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-timesyncd.service + EXTRA_DIST += \ units/systemd-timesyncd.service.in @@ -4611,7 +4692,8 @@ tests += \ if HAVE_PAM pam_systemd_la_SOURCES = \ - src/login/pam-module.c + src/login/pam_systemd.sym \ + src/login/pam_systemd.c pam_systemd_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -4624,7 +4706,7 @@ pam_systemd_la_LDFLAGS = \ -export-dynamic \ -avoid-version \ -shared \ - -export-symbols-regex '^pam_sm_.*' + -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym pam_systemd_la_LIBADD = \ libsystemd-capability.la \ @@ -4739,10 +4821,12 @@ _journal_la_LIBADD = \ id128_la_SOURCES = \ src/python-systemd/id128.c \ - src/python-systemd/id128-constants.h \ src/python-systemd/pyutil.c \ src/python-systemd/pyutil.h +nodist_id128_la_SOURCES = \ + src/python-systemd/id128-constants.h + id128_la_CFLAGS = \ $(AM_CFLAGS) \ -fvisibility=default \ @@ -5089,7 +5173,7 @@ units/user/%: units/%.m4 $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ if ENABLE_POLKIT -nodist_polkitpolicy_DATA = \ +dist_polkitpolicy_DATA = \ $(polkitpolicy_files) \ $(polkitpolicy_in_in_files:.policy.in.in=.policy) endif @@ -5322,11 +5406,34 @@ DISTCHECK_CONFIGURE_FLAGS += \ --with-sysvrcnd-path= endif +if HAVE_PYTHON +DISTCHECK_CONFIGURE_FLAGS += \ + --with-python +endif + if ENABLE_GTK_DOC DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc endif +# +# Require python when making dist +# +.PHONY: dist-check-python +dist-check-python: +if !HAVE_PYTHON + @echo "*** python and python-lxml module must be installed and enabled in order to make dist" + @false +endif + +dist-check-compat-libs: +if !ENABLE_COMPAT_LIBS + @echo "*** compat-libs must be enabled in order to make dist" + @false +endif + +dist: dist-check-python dist-check-compat-libs + # check "broken" platforms limited toolchains for link breakage before we release .PHONY: linkcheck linkcheck: @@ -5388,7 +5495,7 @@ valgrind-tests: $(TESTS) done exported-%: % - $(AM_V_GEN)nm -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@ + $(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@ exported: $(addprefix exported-, $(lib_LTLIBRARIES)) $(AM_V_GEN)cat $^ > $@ @@ -5408,7 +5515,7 @@ ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v))) undefined defined: $(ALL_OBJECTS) $(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \ - nm -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \ + $(NM) -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \ done | cut -c 20- | cut -d @ -f 1 | sort -u > $@ CLEANFILES += \