chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-login: add a public accessor for the VT number
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index fdfdd6515e4c7deda55e5e3ef725f8cbc8d15881..c8283d59e0dcb13135bde3953d5268b62fb4d2ad 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1143,6
+1143,9
@@
EXTRA_DIST += \
test/sched_rr_ok.service \
test/sched_rr_change.service
test/sched_rr_ok.service \
test/sched_rr_change.service
+EXTRA_DIST += \
+ src/test/test-helper.h
+
test_engine_SOURCES = \
src/test/test-engine.c
test_engine_SOURCES = \
src/test/test-engine.c
@@
-1341,7
+1344,8
@@
test_cgroup_util_SOURCES = \
test_cgroup_util_LDADD = \
libsystemd-label.la \
test_cgroup_util_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-daemon.la
test_env_replace_SOURCES = \
src/test/test-env-replace.c
test_env_replace_SOURCES = \
src/test/test-env-replace.c
@@
-1705,6
+1709,7
@@
bin_PROGRAMS += \
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
+if HAVE_BLKID
systemgenerator_PROGRAMS += \
systemd-gpt-auto-generator
systemgenerator_PROGRAMS += \
systemd-gpt-auto-generator
@@
-1721,6
+1726,7
@@
systemd_gpt_auto_generator_LDADD = \
systemd_gpt_auto_generator_CFLAGS = \
$(AM_CFLAGS) \
$(BLKID_CFLAGS)
systemd_gpt_auto_generator_CFLAGS = \
$(AM_CFLAGS) \
$(BLKID_CFLAGS)
+endif
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
@@
-2680,7
+2686,8
@@
test_id128_SOURCES = \
test_id128_LDADD = \
libsystemd-shared.la \
test_id128_LDADD = \
libsystemd-shared.la \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-daemon.la
tests += \
test-id128
tests += \
test-id128
@@
-2852,6
+2859,10
@@
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) \
+ -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
+
test_catalog_LDADD = \
libsystemd-shared.la \
libsystemd-label.la \
test_catalog_LDADD = \
libsystemd-shared.la \
libsystemd-label.la \