chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: test_tables - fix missing symbols when --gc-sections are not available
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 1e4cfb31f1b03302137f7373b8477e6f03870cb7..a5ca64f6a249f7cef365195fd418d30a1169dfe4 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-106,6
+106,8
@@
udevrulesdir=$(udevlibexecdir)/rules.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
+factory_etcdir = $(prefix)/share/factory/etc
+factory_pamdir = $(prefix)/share/factory/etc/pam.d
# And these are the special ones for /
rootprefix=@rootprefix@
# And these are the special ones for /
rootprefix=@rootprefix@
@@
-350,8
+352,7
@@
bin_PROGRAMS = \
systemd-delta \
systemd-analyze \
systemd-run \
systemd-delta \
systemd-analyze \
systemd-run \
- systemd-path \
- systemd-verify
+ systemd-path
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
@@
-408,6
+409,8
@@
dist_zshcompletion_DATA = \
shell-completion/zsh/_systemd-analyze \
shell-completion/zsh/_systemd-run \
shell-completion/zsh/_sd_hosts_or_user_at_host \
shell-completion/zsh/_systemd-analyze \
shell-completion/zsh/_systemd-run \
shell-completion/zsh/_sd_hosts_or_user_at_host \
+ shell-completion/zsh/_sd_outputmodes \
+ shell-completion/zsh/_sd_unit_files \
shell-completion/zsh/_systemd-delta \
shell-completion/zsh/_systemd
shell-completion/zsh/_systemd-delta \
shell-completion/zsh/_systemd
@@
-1226,19
+1229,6
@@
CLEANFILES += \
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
-systemd_verify_SOURCES = \
- src/verify/verify.c
-
-systemd_verify_CFLAGS = \
- $(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
-
-systemd_verify_LDADD = \
- libsystemd-core.la \
- $(RT_LIBS)
-
-# ------------------------------------------------------------------------------
-
manual_tests += \
test-ns \
test-loopback \
manual_tests += \
test-ns \
test-loopback \
@@
-1503,6
+1493,7
@@
test_tables_CFLAGS = \
test_tables_LDADD = \
libsystemd-logs.la \
libsystemd-journal-internal.la \
test_tables_LDADD = \
libsystemd-logs.la \
libsystemd-journal-internal.la \
+ libsystemd-journal-core.la \
libsystemd-core.la \
libudev-core.la \
$(RT_LIBS)
libsystemd-core.la \
libudev-core.la \
$(RT_LIBS)
@@
-1738,11
+1729,19
@@
endif
# ------------------------------------------------------------------------------
systemd_analyze_SOURCES = \
# ------------------------------------------------------------------------------
systemd_analyze_SOURCES = \
- src/analyze/analyze.c
+ src/analyze/analyze.c \
+ src/analyze/analyze-verify.c \
+ src/analyze/analyze-verify.h
+
+systemd_verify_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
systemd_analyze_LDADD = \
systemd_analyze_LDADD = \
+ libsystemd-core.la \
libsystemd-internal.la \
libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ $(RT_LIBS)
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
@@
-1771,6
+1770,7
@@
systemd_update_done_SOURCES = \
systemd_update_done_LDADD = \
libsystemd-internal.la \
systemd_update_done_LDADD = \
libsystemd-internal.la \
+ libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@
-1930,6
+1930,14
@@
INSTALL_DIRS += \
$(sysusersdir)
endif
$(sysusersdir)
endif
+# ------------------------------------------------------------------------------
+dist_factory_etc_DATA = \
+ factory/etc/nsswitch.conf
+
+dist_factory_pam_DATA = \
+ factory/etc/pam.d/system-auth \
+ factory/etc/pam.d/other
+
# ------------------------------------------------------------------------------
if ENABLE_FIRSTBOOT
systemd_firstboot_SOURCES = \
# ------------------------------------------------------------------------------
if ENABLE_FIRSTBOOT
systemd_firstboot_SOURCES = \
@@
-1954,7
+1962,6
@@
EXTRA_DIST += \
SYSINIT_TARGET_WANTS += \
systemd-firstboot.service
SYSINIT_TARGET_WANTS += \
systemd-firstboot.service
-
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-4089,9
+4096,6
@@
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
@@
-4713,6
+4717,12
@@
systemd_resolved_SOURCES = \
src/resolve/resolved-link.c \
src/resolve/resolved-dns-domain.h \
src/resolve/resolved-dns-domain.c \
src/resolve/resolved-link.c \
src/resolve/resolved-dns-domain.h \
src/resolve/resolved-dns-domain.c \
+ src/resolve/resolved-dns-rr.h \
+ src/resolve/resolved-dns-rr.c \
+ src/resolve/resolved-dns-question.h \
+ src/resolve/resolved-dns-question.c \
+ src/resolve/resolved-dns-answer.h \
+ src/resolve/resolved-dns-answer.c \
src/resolve/resolved-dns-packet.h \
src/resolve/resolved-dns-packet.c \
src/resolve/resolved-dns-query.h \
src/resolve/resolved-dns-packet.h \
src/resolve/resolved-dns-packet.c \
src/resolve/resolved-dns-query.h \
@@
-4721,8
+4731,6
@@
systemd_resolved_SOURCES = \
src/resolve/resolved-dns-scope.c \
src/resolve/resolved-dns-server.h \
src/resolve/resolved-dns-server.c \
src/resolve/resolved-dns-scope.c \
src/resolve/resolved-dns-server.h \
src/resolve/resolved-dns-server.c \
- src/resolve/resolved-dns-rr.h \
- src/resolve/resolved-dns-rr.c \
src/resolve/resolved-dns-cache.h \
src/resolve/resolved-dns-cache.c
src/resolve/resolved-dns-cache.h \
src/resolve/resolved-dns-cache.c