chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: use check_PROGRAMS for test-*.c
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ec7507f171c8c5855c616779b9d28ee704b255fe..bd863515fe67edc8a44415842c676edb75738f28 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-98,6
+98,7
@@
dist_pkgsysconf_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
+check_PROGRAMS =
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
@@
-230,21
+231,8
@@
rootlibexec_PROGRAMS = \
systemgenerator_PROGRAMS = \
systemd-getty-generator
systemgenerator_PROGRAMS = \
systemd-getty-generator
-noinst_PROGRAMS = \
- test-engine \
- test-job-type \
- test-ns \
- test-loopback \
- test-hostname \
- test-daemon \
- test-cgroup \
- test-env-replace \
- test-strv \
- test-install \
- test-watchdog
-
dist_bashcompletion_DATA = \
dist_bashcompletion_DATA = \
-
src
/systemd-bash-completion.sh
+
bash-completion
/systemd-bash-completion.sh
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
@@
-521,12
+509,12
@@
noinst_LTLIBRARIES += \
libsystemd-shared.la
libsystemd_shared_la_SOURCES = \
libsystemd-shared.la
libsystemd_shared_la_SOURCES = \
- src/linux/auto_dev-ioctl.h \
- src/linux/fanotify.h \
+ src/shared/linux/auto_dev-ioctl.h \
+ src/shared/linux/fanotify.h \
+ src/shared/missing.h \
src/shared/list.h \
src/shared/macro.h \
src/shared/def.h \
src/shared/list.h \
src/shared/macro.h \
src/shared/def.h \
- src/shared/missing.h \
src/shared/util.c \
src/shared/util.h \
src/shared/virt.c \
src/shared/util.c \
src/shared/util.h \
src/shared/virt.c \
@@
-564,10
+552,6
@@
libsystemd_shared_la_SOURCES = \
src/shared/watchdog.h \
src/shared/spawn-ask-password-agent.c \
src/shared/spawn-ask-password-agent.h \
src/shared/watchdog.h \
src/shared/spawn-ask-password-agent.c \
src/shared/spawn-ask-password-agent.h \
- src/shared/mount-setup.c \
- src/shared/mount-setup.h \
- src/shared/loopback-setup.h \
- src/shared/loopback-setup.c \
src/shared/specifier.c \
src/shared/specifier.h \
src/shared/spawn-polkit-agent.c \
src/shared/specifier.c \
src/shared/specifier.h \
src/shared/spawn-polkit-agent.c \
@@
-759,8
+743,12
@@
libsystemd_core_la_SOURCES = \
src/core/locale-setup.c \
src/core/hostname-setup.c \
src/core/hostname-setup.h \
src/core/locale-setup.c \
src/core/hostname-setup.c \
src/core/hostname-setup.h \
- src/shared/machine-id-setup.c \
- src/shared/machine-id-setup.h \
+ src/core/machine-id-setup.c \
+ src/core/machine-id-setup.h \
+ src/core/mount-setup.c \
+ src/core/mount-setup.h \
+ src/core/loopback-setup.h \
+ src/core/loopback-setup.c \
src/core/fdset.c \
src/core/fdset.h \
src/core/condition.c \
src/core/fdset.c \
src/core/fdset.h \
src/core/condition.c \
@@
-796,7
+784,6
@@
libsystemd_core_la_LIBADD = \
libsystemd-shared.la \
libsystemd-dbus.la \
libudev.la \
libsystemd-shared.la \
libsystemd-dbus.la \
libudev.la \
- $(DBUS_LIBS) \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
@@
-869,6
+856,19
@@
EXTRA_DIST += \
src/core/systemd.pc.in
# ------------------------------------------------------------------------------
src/core/systemd.pc.in
# ------------------------------------------------------------------------------
+check_PROGRAMS += \
+ test-engine \
+ test-job-type \
+ test-ns \
+ test-loopback \
+ test-hostname \
+ test-daemon \
+ test-cgroup \
+ test-env-replace \
+ test-strv \
+ test-install \
+ test-watchdog
+
test_engine_SOURCES = \
src/test/test-engine.c
test_engine_SOURCES = \
src/test/test-engine.c
@@
-901,7
+901,8
@@
test_loopback_SOURCES = \
src/test/test-loopback.c
test_loopback_LDADD = \
src/test/test-loopback.c
test_loopback_LDADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-core.la
test_hostname_SOURCES = \
src/test/test-hostname.c
test_hostname_SOURCES = \
src/test/test-hostname.c
@@
-963,8
+964,7
@@
systemd_initctl_CFLAGS = \
systemd_initctl_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
systemd_initctl_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
- $(DBUS_LIBS)
+ libsystemd-dbus.la
# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
@@
-978,7
+978,6
@@
systemd_update_utmp_CFLAGS = \
systemd_update_utmp_LDADD = \
libsystemd-shared.la \
libsystemd-dbus.la \
systemd_update_utmp_LDADD = \
libsystemd-shared.la \
libsystemd-dbus.la \
- $(DBUS_LIBS) \
$(AUDIT_LIBS)
# ------------------------------------------------------------------------------
$(AUDIT_LIBS)
# ------------------------------------------------------------------------------
@@
-997,7
+996,9
@@
pkginclude_HEADERS += \
systemd_shutdown_SOURCES = \
src/core/umount.c \
src/core/umount.h \
systemd_shutdown_SOURCES = \
src/core/umount.c \
src/core/umount.h \
- src/core/shutdown.c
+ src/core/shutdown.c \
+ src/core/mount-setup.c \
+ src/core/mount-setup.h
systemd_shutdown_LDADD = \
libsystemd-label.la \
systemd_shutdown_LDADD = \
libsystemd-label.la \
@@
-1027,8
+1028,8
@@
systemd_tmpfiles_LDADD = \
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
src/machine-id-setup/machine-id-setup-main.c \
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
src/machine-id-setup/machine-id-setup-main.c \
- src/
shared
/machine-id-setup.c \
- src/
shared
/machine-id-setup.h
+ src/
core
/machine-id-setup.c \
+ src/
core
/machine-id-setup.h
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
@@
-1053,8
+1054,7
@@
systemd_fsck_CFLAGS = \
systemd_fsck_LDADD = \
libsystemd-shared.la \
libsystemd-dbus.la \
systemd_fsck_LDADD = \
libsystemd-shared.la \
libsystemd-dbus.la \
- libudev.la \
- $(DBUS_LIBS)
+ libudev.la
# ------------------------------------------------------------------------------
systemd_timestamp_SOURCES = \
# ------------------------------------------------------------------------------
systemd_timestamp_SOURCES = \
@@
-1096,7
+1096,9
@@
systemd_rc_local_generator_LDADD = \
# ------------------------------------------------------------------------------
systemd_remount_api_vfs_SOURCES = \
# ------------------------------------------------------------------------------
systemd_remount_api_vfs_SOURCES = \
- src/remount-api-vfs/remount-api-vfs.c
+ src/remount-api-vfs/remount-api-vfs.c \
+ src/core/mount-setup.c \
+ src/core/mount-setup.h
systemd_remount_api_vfs_LDADD = \
libsystemd-shared.la
systemd_remount_api_vfs_LDADD = \
libsystemd-shared.la
@@
-1111,8
+1113,7
@@
systemd_cgroups_agent_CFLAGS = \
systemd_cgroups_agent_LDADD = \
libsystemd-shared.la \
systemd_cgroups_agent_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la \
- $(DBUS_LIBS)
+ libsystemd-dbus.la
# ------------------------------------------------------------------------------
systemctl_SOURCES = \
# ------------------------------------------------------------------------------
systemctl_SOURCES = \
@@
-1130,7
+1131,6
@@
systemctl_LDADD = \
libsystemd-id128.la \
libsystemd-dbus.la \
libsystemd-logs.la
libsystemd-id128.la \
libsystemd-dbus.la \
libsystemd-logs.la
- $(DBUS_LIBS)
# ------------------------------------------------------------------------------
systemd_notify_SOURCES = \
# ------------------------------------------------------------------------------
systemd_notify_SOURCES = \
@@
-1172,7
+1172,11
@@
systemd_cgtop_LDADD = \
# ------------------------------------------------------------------------------
systemd_nspawn_SOURCES = \
# ------------------------------------------------------------------------------
systemd_nspawn_SOURCES = \
- src/nspawn/nspawn.c
+ src/nspawn/nspawn.c \
+ src/core/mount-setup.c \
+ src/core/mount-setup.h \
+ src/core/loopback-setup.c \
+ src/core/loopback-setup.h
systemd_nspawn_LDADD = \
libsystemd-label.la \
systemd_nspawn_LDADD = \
libsystemd-label.la \
@@
-1478,7
+1482,7
@@
TESTS = \
src/udev/test/udev-test.pl \
src/udev/test/rules-test.sh
src/udev/test/udev-test.pl \
src/udev/test/rules-test.sh
-check_PROGRAMS = \
+check_PROGRAMS
+
= \
test-libudev \
test-udev
test-libudev \
test-udev
@@
-1920,7
+1924,7
@@
test_id128_LDADD = \
libsystemd-shared.la \
libsystemd-id128.la
libsystemd-shared.la \
libsystemd-id128.la
-
noinst
_PROGRAMS += \
+
check
_PROGRAMS += \
test-id128
pkginclude_HEADERS += \
test-id128
pkginclude_HEADERS += \
@@
-2099,7
+2103,7
@@
libsystemd-journal-uninstall-hook:
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
-
noinst
_PROGRAMS += \
+
check
_PROGRAMS += \
test-journal \
test-journal-send
test-journal \
test-journal-send
@@
-2401,8
+2405,7
@@
systemd_hostnamed_CFLAGS = \
systemd_hostnamed_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
systemd_hostnamed_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
- $(DBUS_LIBS)
+ libsystemd-dbus.la
rootlibexec_PROGRAMS += \
systemd-hostnamed
rootlibexec_PROGRAMS += \
systemd-hostnamed
@@
-2452,8
+2455,7
@@
systemd_localed_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
- $(DBUS_LIBS)
+ libsystemd-dbus.la
nodist_systemunit_DATA += \
units/systemd-localed.service
nodist_systemunit_DATA += \
units/systemd-localed.service
@@
-2512,8
+2514,7
@@
systemd_timedated_CFLAGS = \
systemd_timedated_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
systemd_timedated_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
- $(DBUS_LIBS)
+ libsystemd-dbus.la
rootlibexec_PROGRAMS += \
systemd-timedated
rootlibexec_PROGRAMS += \
systemd-timedated
@@
-2582,8
+2583,7
@@
systemd_logind_LDADD = \
libsystemd-audit.la \
libsystemd-daemon.la \
libsystemd-dbus.la \
libsystemd-audit.la \
libsystemd-daemon.la \
libsystemd-dbus.la \
- libudev.la \
- $(DBUS_LIBS)
+ libudev.la
if HAVE_ACL
systemd_logind_SOURCES += \
if HAVE_ACL
systemd_logind_SOURCES += \
@@
-2614,8
+2614,7
@@
loginctl_CFLAGS = \
loginctl_LDADD = \
libsystemd-shared.la \
libsystemd-dbus.la \
loginctl_LDADD = \
libsystemd-shared.la \
libsystemd-dbus.la \
- libudev.la \
- $(DBUS_LIBS)
+ libudev.la
rootbin_PROGRAMS += \
loginctl
rootbin_PROGRAMS += \
loginctl
@@
-2627,7
+2626,7
@@
test_login_LDADD = \
libsystemd-login.la \
libsystemd-shared.la
libsystemd-login.la \
libsystemd-shared.la
-
noinst
_PROGRAMS += \
+
check
_PROGRAMS += \
test-login
libsystemd_login_la_SOURCES = \
test-login
libsystemd_login_la_SOURCES = \
@@
-2667,9
+2666,9
@@
pam_systemd_la_LDFLAGS = \
pam_systemd_la_LIBADD = \
libsystemd-daemon.la \
libsystemd-audit.la \
pam_systemd_la_LIBADD = \
libsystemd-daemon.la \
libsystemd-audit.la \
+ libsystemd-dbus.la \
libsystemd-shared.la \
libsystemd-shared.la \
- $(PAM_LIBS) \
- $(DBUS_LIBS)
+ $(PAM_LIBS)
pamlib_LTLIBRARIES = \
pam_systemd.la
pamlib_LTLIBRARIES = \
pam_systemd.la