X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=4b292b2105312a515760eea1e478a2f1b49fc186;hp=06105bde36493298a494dadc7e5edd9cbb0bf74f;hb=843fecc076c8a58cda13e51362d145f7452db0e9;hpb=326bb68c40ff2a7119c344b9ab7a7473f9fcdf3c diff --git a/Makefile.am b/Makefile.am index 06105bde3..4b292b210 100644 --- a/Makefile.am +++ b/Makefile.am @@ -827,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 \ @@ -837,7 +839,8 @@ nodist_libsystemd_shared_la_SOURCES = \ libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ - $(SECCOMP_CFLAGS) + $(SECCOMP_CFLAGS) \ + -pthread # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -1243,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 \ @@ -1347,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 @@ -1600,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 @@ -1821,6 +1853,9 @@ EXTRA_DIST += \ units/systemd-sysusers.service.in \ sysusers.d/systemd.conf.in +CLEANFILES += \ + sysusers.d/systemd.conf + INSTALL_DIRS += \ $(sysusersdir) endif @@ -2611,6 +2646,7 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/sd-icmp6-nd.c \ src/libsystemd-network/sd-dhcp6-client.c \ src/libsystemd-network/dhcp6-internal.h \ + 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 \ @@ -2666,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 @@ -2677,7 +2713,6 @@ test_icmp6_rs_LDADD = \ test_dhcp6_client_SOURCES = \ src/systemd/sd-dhcp6-client.h \ - src/libsystemd-network/dhcp6-icmp6.h \ src/libsystemd-network/dhcp6-internal.h \ src/libsystemd-network/test-dhcp6-client.c @@ -3154,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\ @@ -3197,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 $@) @@ -3472,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 \ @@ -3554,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 \ @@ -3766,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 @@ -4636,7 +4689,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) \ @@ -4649,7 +4703,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 \ @@ -4764,10 +4818,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 \ @@ -5347,11 +5403,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: @@ -5413,7 +5492,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 $^ > $@ @@ -5433,7 +5512,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 += \