chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TODO: Add items for the DHCPv6 implementation
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 96598561365d8178ae21e4a5d8077e26e7c0378c..e02dede7a139ca159c2ab48ff3b63e6f6a3efc74 100644
(file)
--- 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/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 \
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) \
libsystemd_shared_la_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ -pthread
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-1244,7
+1247,10
@@
tests += \
test-architecture \
test-socket-util \
test-fdset \
test-architecture \
test-socket-util \
test-fdset \
- test-conf-files
+ test-conf-files \
+ test-capability \
+ test-async \
+ test-ratelimit
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1348,12
+1354,31
@@
test_utf8_SOURCES = \
test_utf8_LDADD = \
libsystemd-shared.la
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_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
test_util_SOURCES = \
src/test/test-util.c
@@
-1612,7
+1637,7
@@
test_conf_files_LDADD = \
.PHONY: coverage lcov-run lcov-report coverage-sync
# run lcov from scratch, always
.PHONY: coverage lcov-run lcov-report coverage-sync
# run lcov from scratch, always
-coverage:
+coverage:
all
$(MAKE) lcov-run
$(MAKE) lcov-report
$(MAKE) lcov-run
$(MAKE) lcov-report
@@
-3164,6
+3189,7
@@
CLEANFILES += \
src/gudev/gudev-1.0.pc
libgudev_1_0_la_SOURCES = \
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\
src/gudev/gudevenums.h \
src/gudev/gudevenumtypes.h \
src/gudev/gudevenumtypes.h\
@@
-3207,8
+3233,9
@@
libgudev_1_0_la_LIBADD = \
libgudev_1_0_la_LDFLAGS = \
$(AM_LDFLAGS) \
-version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
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 $@)
src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
$(AM_V_at)$(MKDIR_P) $(dir $@)
@@
-3482,6
+3509,15
@@
test_catalog_CPPFLAGS = \
test_catalog_LDADD = \
libsystemd-journal-core.la
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 \
libsystemd_journal_core_la_SOURCES = \
src/journal/journald-kmsg.c \
src/journal/journald-kmsg.h \
@@
-3564,6
+3600,10
@@
tests += \
test-mmap-cache \
test-catalog
test-mmap-cache \
test-catalog
+if HAVE_XZ
+tests += test-compress
+endif
+
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
src/systemd/sd-messages.h \
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
src/systemd/sd-messages.h \
@@
-3776,6
+3816,9
@@
dist_bashcompletion_DATA += \
dist_zshcompletion_DATA += \
shell-completion/zsh/_coredumpctl
dist_zshcompletion_DATA += \
shell-completion/zsh/_coredumpctl
+GENERAL_ALIASES += \
+ $(bindir)/coredumpctl $(bindir)/systemd-coredumpctl
+
sysctl_DATA = \
sysctl.d/50-coredump.conf
sysctl_DATA = \
sysctl.d/50-coredump.conf
@@
-4258,6
+4301,9
@@
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-timesyncd.service
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
EXTRA_DIST += \
units/systemd-timesyncd.service.in
@@
-4646,7
+4692,8
@@
tests += \
if HAVE_PAM
pam_systemd_la_SOURCES = \
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) \
pam_systemd_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-4659,7
+4706,7
@@
pam_systemd_la_LDFLAGS = \
-export-dynamic \
-avoid-version \
-shared \
-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 \
pam_systemd_la_LIBADD = \
libsystemd-capability.la \
@@
-5126,7
+5173,7
@@
units/user/%: units/%.m4
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
if ENABLE_POLKIT
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
if ENABLE_POLKIT
-
no
dist_polkitpolicy_DATA = \
+dist_polkitpolicy_DATA = \
$(polkitpolicy_files) \
$(polkitpolicy_in_in_files:.policy.in.in=.policy)
endif
$(polkitpolicy_files) \
$(polkitpolicy_in_in_files:.policy.in.in=.policy)
endif
@@
-5379,7
+5426,13
@@
if !HAVE_PYTHON
@false
endif
@false
endif
-dist: dist-check-python
+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
# check "broken" platforms limited toolchains for link breakage before we release
.PHONY: linkcheck
@@
-5442,7
+5495,7
@@
valgrind-tests: $(TESTS)
done
exported-%: %
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 $^ > $@
exported: $(addprefix exported-, $(lib_LTLIBRARIES))
$(AM_V_GEN)cat $^ > $@
@@
-5462,7
+5515,7
@@
ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v)))
undefined defined: $(ALL_OBJECTS)
$(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \
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 += \
done | cut -c 20- | cut -d @ -f 1 | sort -u > $@
CLEANFILES += \