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-fileio: replace mktemp with mkstemp to avoid warnings
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index c13956dc9dcf8ace2e3b9ac853fcccf0661466c2..25bbcab888bff43ed8e55e66579ee18ef8a1c6eb 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-652,10
+652,12
@@
test_rtnl_SOURCES = \
test_rtnl_LDADD = \
libsystemd-rtnl.la \
libsystemd-bus-internal.la \
test_rtnl_LDADD = \
libsystemd-rtnl.la \
libsystemd-bus-internal.la \
+ libsystemd-daemon-internal.la \
libsystemd-id128-internal.la \
libsystemd-shared.la
libsystemd-id128-internal.la \
libsystemd-shared.la
-tests += test-rtnl
+tests += \
+ test-rtnl
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-1349,10
+1351,9
@@
test_cgroup_LDADD = \
test_cgroup_mask_SOURCES = \
src/test/test-cgroup-mask.c
test_cgroup_mask_SOURCES = \
src/test/test-cgroup-mask.c
-test_cgroup_mask_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS) \
- -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+test_cgroup_mask_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DTEST_DIR=\"$(abs_top_srcdir)/test\"
test_cgroup_mask_LDADD = \
libsystemd-core.la \
test_cgroup_mask_LDADD = \
libsystemd-core.la \
@@
-1416,9
+1417,9
@@
test_watchdog_LDADD = \
test_sched_prio_SOURCES = \
src/test/test-sched-prio.c
test_sched_prio_SOURCES = \
src/test/test-sched-prio.c
-test_sched_prio_CFLAGS = \
- $(AM_CFLAGS) \
- -D
"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)
"
+test_sched_prio_C
PP
FLAGS = \
+ $(AM_C
PP
FLAGS) \
+ -D
TEST_DIR=\"$(abs_top_srcdir)/test\
"
test_sched_prio_LDADD = \
libsystemd-core.la \
test_sched_prio_LDADD = \
libsystemd-core.la \
@@
-2951,7
+2952,9
@@
systemd_journald_SOURCES = \
src/journal/journald-server.h
systemd_journald_LDADD = \
src/journal/journald-server.h
systemd_journald_LDADD = \
- libsystemd-journal-core.la
+ libsystemd-journal-core.la \
+ libsystemd-bus-internal.la \
+ libsystemd-shared.la
systemd_cat_SOURCES = \
src/journal/cat.c
systemd_cat_SOURCES = \
src/journal/cat.c
@@
-3058,8
+3061,8
@@
test_mmap_cache_LDADD = \
test_catalog_SOURCES = \
src/journal/test-catalog.c
test_catalog_SOURCES = \
src/journal/test-catalog.c
-test_catalog_CFLAGS = \
- $(AM_CFLAGS) \
+test_catalog_C
PP
FLAGS = \
+ $(AM_C
PP
FLAGS) \
-DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
test_catalog_LDADD = \
-DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
test_catalog_LDADD = \
@@
-3317,9
+3320,12
@@
systemd_journal_gatewayd_LDADD = \
systemd_journal_gatewayd_CFLAGS = \
$(AM_CFLAGS) \
systemd_journal_gatewayd_CFLAGS = \
$(AM_CFLAGS) \
- -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
$(MICROHTTPD_CFLAGS)
$(MICROHTTPD_CFLAGS)
+systemd_journal_gatewayd_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
+
dist_systemunit_DATA += \
units/systemd-journal-gatewayd.socket
dist_systemunit_DATA += \
units/systemd-journal-gatewayd.socket
@@
-3964,10
+3970,12
@@
test_network_LDADD = \
libudev-internal.la \
libsystemd-bus-internal.la \
libsystemd-id128-internal.la \
libudev-internal.la \
libsystemd-bus-internal.la \
libsystemd-id128-internal.la \
+ libsystemd-daemon-internal.la \
libsystemd-rtnl.la \
libsystemd-shared.la
libsystemd-rtnl.la \
libsystemd-shared.la
-tests += test-network
+tests += \
+ test-network
EXTRA_DIST += \
src/network/networkd-gperf.gperf \
EXTRA_DIST += \
src/network/networkd-gperf.gperf \