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-cgroup-mask: fix masks in test and enable by default
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index f0482cfe72c76131792376163583873c1170cd0c..91ecbe4a0bc1d39688cecbbf015a21ed4e835a8b 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-189,6
+189,7
@@
AM_CPPFLAGS = \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
-DROOTLIBDIR=\"$(rootlibdir)\" \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
-DROOTLIBDIR=\"$(rootlibdir)\" \
+ -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/shared \
-I $(top_srcdir)/src/shared \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/shared \
-I $(top_srcdir)/src/shared \
@@
-1224,13
+1225,11
@@
CLEANFILES += \
# ------------------------------------------------------------------------------
manual_tests += \
# ------------------------------------------------------------------------------
manual_tests += \
- test-engine \
test-ns \
test-loopback \
test-hostname \
test-daemon \
test-cgroup \
test-ns \
test-loopback \
test-hostname \
test-daemon \
test-cgroup \
- test-cgroup-mask \
test-install \
test-watchdog \
test-log \
test-install \
test-watchdog \
test-log \
@@
-1242,6
+1241,8
@@
manual_tests += \
endif
tests += \
endif
tests += \
+ test-engine \
+ test-cgroup-mask \
test-job-type \
test-env-replace \
test-strbuf \
test-job-type \
test-env-replace \
test-strbuf \
@@
-2898,11
+2899,12
@@
test_unifont_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
-update-unifont:
- $(AM_V_GEN)cat $(top_srcdir)/src/libsystemd-terminal/unifont.hex | $(PYTHON) $(top_srcdir)/tools/compile-unifont.py >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin
- @echo "unifont-glyph-array.bin has been regenerated"
-
.PHONY: update-unifont
.PHONY: update-unifont
+update-unifont: tools/compile-unifont.py
+ $(AM_V_GEN)$(PYTHON) $< \
+ <$(top_srcdir)/src/libsystemd-terminal/unifont.hex \
+ >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin
+ @echo "unifont-glyph-array.bin has been regenerated"
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
@@
-4437,9
+4439,6
@@
dist_pkgdata_DATA += \
dist_noinst_SCRIPT = \
src/locale/generate-kbd-model-map
dist_noinst_SCRIPT = \
src/locale/generate-kbd-model-map
-update-kbd-model-map: src/locale/generate-kbd-model-map
- $PYTHON $< >src/locale/kbd-model-map
-
localectl_SOURCES = \
src/locale/localectl.c
localectl_SOURCES = \
src/locale/localectl.c
@@
-4554,7
+4553,7
@@
nodist_systemunit_DATA += \
units/systemd-timesyncd.service
GENERAL_ALIASES += \
units/systemd-timesyncd.service
GENERAL_ALIASES += \
- $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/
multi-user
.target.wants/systemd-timesyncd.service
+ $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/
sysinit
.target.wants/systemd-timesyncd.service
EXTRA_DIST += \
units/systemd-timesyncd.service.in
EXTRA_DIST += \
units/systemd-timesyncd.service.in