chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update NEWS
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 7b4b2d8c48a832b1949de6dbba0c1593d208d83a..d594a3d935872fc6a3836f3320eb356003acd5bc 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-32,28
+32,28
@@
SUBDIRS = . po
.SECONDARY:
LIBUDEV_CURRENT=4
.SECONDARY:
LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=
2
+LIBUDEV_REVISION=
3
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=
5
+LIBSYSTEMD_LOGIN_CURRENT=
6
LIBSYSTEMD_LOGIN_REVISION=0
LIBSYSTEMD_LOGIN_REVISION=0
-LIBSYSTEMD_LOGIN_AGE=
5
+LIBSYSTEMD_LOGIN_AGE=
6
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=
9
+LIBSYSTEMD_DAEMON_REVISION=
10
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=2
0
+LIBSYSTEMD_ID128_REVISION=2
1
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=
9
+LIBSYSTEMD_JOURNAL_CURRENT=
10
LIBSYSTEMD_JOURNAL_REVISION=0
LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=
9
+LIBSYSTEMD_JOURNAL_AGE=
10
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-124,9
+124,15
@@
dbusinterface_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
-noinst_tests=
-noinst_PROGRAMS = $(noinst_tests)
-TESTS = $(noinst_tests)
+tests=
+manual_tests =
+if ENABLE_TESTS
+noinst_PROGRAMS = $(manual_tests) $(tests)
+TESTS = $(tests)
+else
+noinst_PROGRAMS =
+TESTS =
+endif
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
@@
-1063,7
+1069,7
@@
CLEANFILES += \
src/core/org.freedesktop.systemd1.policy.in
# ------------------------------------------------------------------------------
src/core/org.freedesktop.systemd1.policy.in
# ------------------------------------------------------------------------------
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-engine \
test-ns \
test-loopback \
test-engine \
test-ns \
test-loopback \
@@
-1074,7
+1080,7
@@
noinst_PROGRAMS += \
test-watchdog \
test-log
test-watchdog \
test-log
-
noinst_
tests += \
+tests += \
test-job-type \
test-env-replace \
test-strbuf \
test-job-type \
test-env-replace \
test-strbuf \
@@
-1145,7
+1151,7
@@
test_hostname_LDADD = \
libsystemd-core.la
if ENABLE_EFI
libsystemd-core.la
if ENABLE_EFI
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-efivars
test_efivars_SOURCES = \
test-efivars
test_efivars_SOURCES = \
@@
-1726,7
+1732,7
@@
libsystemd_bus_la_LIBADD = \
noinst_LTLIBRARIES += \
libsystemd-bus.la
noinst_LTLIBRARIES += \
libsystemd-bus.la
-
noinst_
tests += \
+tests += \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
@@
-2074,7
+2080,7
@@
TESTS += \
test/udev-test.pl \
test/rules-test.sh
test/udev-test.pl \
test/rules-test.sh
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-libudev \
test-udev
test-libudev \
test-udev
@@
-2527,7
+2533,7
@@
test_id128_LDADD = \
libsystemd-shared.la \
libsystemd-id128-internal.la
libsystemd-shared.la \
libsystemd-id128-internal.la
-
noinst_
tests += \
+tests += \
test-id128
pkginclude_HEADERS += \
test-id128
pkginclude_HEADERS += \
@@
-2835,10
+2841,10
@@
catalog-remove-hook:
UNINSTALL_DATA_HOOKS += \
catalog-remove-hook
UNINSTALL_DATA_HOOKS += \
catalog-remove-hook
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-journal-enum
test-journal-enum
-
noinst_
tests += \
+tests += \
test-journal \
test-journal-send \
test-journal-syslog \
test-journal \
test-journal-send \
test-journal-syslog \
@@
-3461,8
+3467,8
@@
systemd_logind_CFLAGS = \
systemd_logind_LDADD = \
libsystemd-label.la \
systemd_logind_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-audit.la \
+ libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-dbus.la \
libudev.la
libsystemd-daemon.la \
libsystemd-dbus.la \
libudev.la
@@
-3536,7
+3542,7
@@
test_inhibit_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
-
noinst_PROGRAMS
+= \
+
manual_tests
+= \
test-login \
test-inhibit
test-login \
test-inhibit