chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: perform autodetection of quota-tools binaries
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ad39973aefefc9a702c1db9c72cf5d328749cf3c..730db1d5a888403b65fd687bd7c74a0808d39c53 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-35,7
+35,7
@@
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=
2
+LIBSYSTEMD_LOGIN_REVISION=
3
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
@@
-43,11
+43,11
@@
LIBSYSTEMD_DAEMON_REVISION=4
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=
8
+LIBSYSTEMD_ID128_REVISION=
9
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=4
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=4
-LIBSYSTEMD_JOURNAL_REVISION=
0
+LIBSYSTEMD_JOURNAL_REVISION=
1
LIBSYSTEMD_JOURNAL_AGE=4
# Dirs of external packages
LIBSYSTEMD_JOURNAL_AGE=4
# Dirs of external packages
@@
-382,6
+382,7
@@
EXTRA_DIST += \
units/debug-shell.service.in \
units/systemd-hibernate.service.in \
units/systemd-suspend.service.in \
units/debug-shell.service.in \
units/systemd-hibernate.service.in \
units/systemd-suspend.service.in \
+ units/quotaon.service.in \
introspect.awk \
man/custom-html.xsl
introspect.awk \
man/custom-html.xsl
@@
-513,6
+514,7
@@
MANPAGES = \
man/sd_journal_get_cutoff_realtime_usec.3 \
man/sd_journal_get_cursor.3 \
man/sd_journal_get_fd.3 \
man/sd_journal_get_cutoff_realtime_usec.3 \
man/sd_journal_get_cursor.3 \
man/sd_journal_get_fd.3 \
+ man/sd_journal_get_usage.3 \
man/sd_journal_add_match.3 \
man/sd_journal_seek_head.3
man/sd_journal_add_match.3 \
man/sd_journal_seek_head.3
@@
-1003,6
+1005,7
@@
libsystemd_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-dbus.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-dbus.la \
+ libsystemd-id128-internal.la \
libudev.la \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
libudev.la \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
@@
-1117,13
+1120,16
@@
noinst_PROGRAMS += \
test-strv \
test-install \
test-watchdog \
test-strv \
test-install \
test-watchdog \
- test-unit-name
+ test-unit-name \
+ test-log \
+ test-unit-file
TESTS += \
test-job-type \
test-env-replace \
test-strv \
TESTS += \
test-job-type \
test-env-replace \
test-strv \
- test-unit-name
+ test-unit-name \
+ test-unit-file
test_engine_SOURCES = \
src/test/test-engine.c
test_engine_SOURCES = \
src/test/test-engine.c
@@
-1173,6
+1179,18
@@
test_unit_name_SOURCES = \
test_unit_name_LDADD = \
libsystemd-core.la
test_unit_name_LDADD = \
libsystemd-core.la
+test_unit_file_SOURCES = \
+ src/test/test-unit-file.c
+
+test_unit_file_LDADD = \
+ libsystemd-core.la
+
+test_log_SOURCES = \
+ src/test/test-log.c
+
+test_log_LDADD = \
+ libsystemd-core.la
+
test_daemon_SOURCES = \
src/test/test-daemon.c
test_daemon_SOURCES = \
src/test/test-daemon.c
@@
-1289,7
+1307,8
@@
systemd_tmpfiles_SOURCES = \
systemd_tmpfiles_LDADD = \
libsystemd-label.la \
systemd_tmpfiles_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-capability.la
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
@@
-2568,8
+2587,9
@@
journal-install-data-hook:
rm -f systemd-journald.socket && \
$(LN_S) ../systemd-journald.socket )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f systemd-journald.socket && \
$(LN_S) ../systemd-journald.socket )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
- rm -f systemd-journald.service && \
- $(LN_S) ../systemd-journald.service )
+ rm -f systemd-journald.service systemd-journal-flush.service && \
+ $(LN_S) ../systemd-journald.service && \
+ $(LN_S) ../systemd-journal-flush.service )
INSTALL_DATA_HOOKS += \
journal-install-data-hook
INSTALL_DATA_HOOKS += \
journal-install-data-hook
@@
-2775,6
+2795,9
@@
endif
EXTRA_DIST += \
units/systemd-quotacheck.service.in
EXTRA_DIST += \
units/systemd-quotacheck.service.in
+nodist_systemunit_DATA += \
+ units/quotaon.service
+
# ------------------------------------------------------------------------------
if ENABLE_RANDOMSEED
rootlibexec_PROGRAMS += \
# ------------------------------------------------------------------------------
if ENABLE_RANDOMSEED
rootlibexec_PROGRAMS += \
@@
-3408,6
+3431,8
@@
SED_PROCESS = \
-e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-e 's,@sushell\@,$(sushell),g' \
-e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-e 's,@sushell\@,$(sushell),g' \
+ -e 's,@QUOTAON\@,$(QUOTAON),g' \
+ -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
< $< > $@
units/%: units/%.in Makefile
< $< > $@
units/%: units/%.in Makefile
@@
-3473,7
+3498,7
@@
CLEANFILES += \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)
-if
HAVE_XSLTPROC
+if
ENABLE_MANPAGES
XSLTPROC_FLAGS = \
--nonet \
--stringparam man.output.quietly 1 \
XSLTPROC_FLAGS = \
--nonet \
--stringparam man.output.quietly 1 \