chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: make gcc shut up
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 927d25f0856b45ca715e392d2f55388154930bec..be97193b456d8a4f7dedae5709a00cb28fdfdcbf 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-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) \
@@
-1118,13
+1121,15
@@
noinst_PROGRAMS += \
test-install \
test-watchdog \
test-unit-name \
test-install \
test-watchdog \
test-unit-name \
- test-log
+ 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
@@
-1174,6
+1179,12
@@
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_SOURCES = \
src/test/test-log.c
@@
-1296,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 = \
@@
-2575,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
@@
-2782,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 += \
@@
-3392,6
+3408,37
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
+if HAVE_PYTHON_DEVEL
+
+pkgpyexec_LTLIBRARIES = \
+ _journal.la
+
+_journal_la_SOURCES = \
+ src/python-systemd/_journal.c
+
+_journal_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -fvisibility=default \
+ $(PYTHON_CFLAGS)
+
+_journal_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -shared \
+ -module \
+ -avoid-version
+
+_journal_la_LIBADD = \
+ $(PYTHON_LIBS) \
+ libsystemd-journal.la
+
+dist_pkgpyexec_PYTHON = \
+ src/python-systemd/journal.py \
+ src/python-systemd/__init__.py
+
+endif
+
+# ------------------------------------------------------------------------------
+
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
@@
-3415,6
+3462,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