chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hwdb: Update database of Bluetooth company identifiers
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index cb43ddb081b4a31862beac49fed09f7f790c08fc..dea0633a95246c9c95658860018f5b0608fa18c1 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-297,10
+297,14
@@
define install-relative-aliases
done
endef
done
endef
+install-touch-usr-hook:
+ touch -c $(DESTDIR)/$(prefix)
+
INSTALL_EXEC_HOOKS += \
install-target-wants-hook \
install-directories-hook \
INSTALL_EXEC_HOOKS += \
install-target-wants-hook \
install-directories-hook \
- install-aliases-hook
+ install-aliases-hook \
+ install-touch-usr-hook
# ------------------------------------------------------------------------------
AM_V_M4 = $(AM_V_M4_$(V))
# ------------------------------------------------------------------------------
AM_V_M4 = $(AM_V_M4_$(V))
@@
-509,6
+513,9
@@
dist_userunit_DATA = \
nodist_userunit_DATA = \
units/user/systemd-exit.service
nodist_userunit_DATA = \
units/user/systemd-exit.service
+dist_systempreset_DATA = \
+ system-preset/90-systemd.preset
+
EXTRA_DIST += \
units/getty@.service.m4 \
units/serial-getty@.service.m4 \
EXTRA_DIST += \
units/getty@.service.m4 \
units/serial-getty@.service.m4 \
@@
-1234,7
+1241,8
@@
tests += \
test-device-nodes \
test-xml \
test-architecture \
test-device-nodes \
test-xml \
test-architecture \
- test-socket-util
+ test-socket-util \
+ test-fdset
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1338,6
+1346,12
@@
test_utf8_SOURCES = \
test_utf8_LDADD = \
libsystemd-shared.la
test_utf8_LDADD = \
libsystemd-shared.la
+test_fdset_SOURCES = \
+ src/test/test-fdset.c
+
+test_fdset_LDADD = \
+ libsystemd-core.la
+
test_util_SOURCES = \
src/test/test-util.c
test_util_SOURCES = \
src/test/test-util.c
@@
-3523,7
+3537,7
@@
libsystemd_journal_internal_la_SOURCES = \
src/journal/mmap-cache.h
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
src/journal/mmap-cache.h
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS =
+libsystemd_journal_internal_la_CFLAGS =
\
$(AM_CFLAGS)
libsystemd_journal_internal_la_LIBADD =
$(AM_CFLAGS)
libsystemd_journal_internal_la_LIBADD =
@@
-3919,7
+3933,8
@@
systemgenerator_PROGRAMS += \
systemd-cryptsetup-generator
dist_systemunit_DATA += \
systemd-cryptsetup-generator
dist_systemunit_DATA += \
- units/cryptsetup.target
+ units/cryptsetup.target \
+ units/cryptsetup-pre.target
systemd_cryptsetup_SOURCES = \
src/cryptsetup/cryptsetup.c
systemd_cryptsetup_SOURCES = \
src/cryptsetup/cryptsetup.c