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: move systemd-analyze into its own subdir
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ff156c00eefb1a44901e77a8d6b0ff4e5e09714d..83c0678b5cd6e397671d6dc357169e08e884c9c6 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-83,7
+83,6
@@
BUILT_SOURCES =
INSTALL_EXEC_HOOKS =
UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
INSTALL_EXEC_HOOKS =
UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
-DISTCHECK_HOOKS =
DISTCLEAN_LOCAL_HOOKS =
pkginclude_HEADERS =
noinst_LTLIBRARIES =
DISTCLEAN_LOCAL_HOOKS =
pkginclude_HEADERS =
noinst_LTLIBRARIES =
@@
-98,6
+97,8
@@
dist_pkgsysconf_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
+check_PROGRAMS =
+TESTS =
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
@@
-210,7
+211,7
@@
bin_PROGRAMS = \
systemd-detect-virt
dist_bin_SCRIPTS = \
systemd-detect-virt
dist_bin_SCRIPTS = \
- src/systemd-analyze
+ src/systemd-analyze
/systemd-analyze
rootlibexec_PROGRAMS = \
systemd \
rootlibexec_PROGRAMS = \
systemd \
@@
-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 \
@@
-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
@@
-964,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 = \
@@
-979,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)
# ------------------------------------------------------------------------------
@@
-1056,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 = \
@@
-1116,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 = \
@@
-1135,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 = \
@@
-1483,11
+1478,11
@@
udevadm_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd-shared.la
# ------------------------------------------------------------------------------
-TESTS = \
+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
@@
-1518,8
+1513,9
@@
DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
EXTRA_DIST += \
src/udev/test/sys.tar.xz \
EXTRA_DIST += \
src/udev/test/sys.tar.xz \
- $(TESTS) \
- src/udev/test/rule-syntax-check.py
+ src/udev/test/rule-syntax-check.py \
+ src/udev/test/udev-test.pl \
+ src/udev/test/rules-test.sh
# ------------------------------------------------------------------------------
ata_id_SOURCES = \
# ------------------------------------------------------------------------------
ata_id_SOURCES = \
@@
-1795,6
+1791,9
@@
dist_udevhome_SCRIPTS = \
src/udev/keymap/findkeyboards \
src/udev/keymap/keyboard-force-release.sh
src/udev/keymap/findkeyboards \
src/udev/keymap/keyboard-force-release.sh
+TESTS += \
+ src/udev/keymap/check-keymaps.sh
+
EXTRA_DIST += \
src/udev/keymap/check-keymaps.sh
EXTRA_DIST += \
src/udev/keymap/check-keymaps.sh
@@
-1884,10
+1883,6
@@
src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile
src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
-keymaps-distcheck-hook: src/udev/keymap/keys.txt
- $(top_srcdir)/src/udev/keymap/check-keymaps.sh $(top_srcdir) $^
-DISTCHECK_HOOKS += keymaps-distcheck-hook
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-1929,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 += \
@@
-2108,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
@@
-2410,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
@@
-2461,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
@@
-2521,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
@@
-2591,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 += \
@@
-2623,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
@@
-2636,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 = \
@@
-2676,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
@@
-3182,8
+3172,6
@@
uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
-distcheck-hook: $(DISTCHECK_HOOKS)
-
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
DISTCHECK_CONFIGURE_FLAGS = \
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
DISTCHECK_CONFIGURE_FLAGS = \