chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: check the right variable for failed open()
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index cbb405b15e7107c4674abecbb5392f1c84ea7808..669eb338dc166f8e64a96ec5e2965d37990e652d 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-101,6
+101,7
@@
udevrulesdir=$(udevlibexecdir)/rules.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
+ntpunitsdir=$(prefix)/lib/systemd/ntp-units.d
# And these are the special ones for /
rootprefix=@rootprefix@
# And these are the special ones for /
rootprefix=@rootprefix@
@@
-128,6
+129,7
@@
polkitpolicy_in_files =
polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
+nodist_pkgsysconf_DATA =
dist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
@@
-4017,7
+4019,17
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
if ENABLE_TIMESYNCD
systemd_timesyncd_SOURCES = \
# ------------------------------------------------------------------------------
if ENABLE_TIMESYNCD
systemd_timesyncd_SOURCES = \
- src/timesync/timesyncd.c
+ src/timesync/timesyncd.c \
+ src/timesync/timesyncd.h
+
+nodist_systemd_timesyncd_SOURCES = \
+ src/timesync/timesyncd-gperf.c
+
+EXTRA_DIST += \
+ src/timesync/timesyncd-gperf.gperf
+
+CLEANFILES += \
+ src/timesync/timesyncd-gperf.c
systemd_timesyncd_LDADD = \
libsystemd-label.la \
systemd_timesyncd_LDADD = \
libsystemd-label.la \
@@
-4034,6
+4046,19
@@
nodist_systemunit_DATA += \
EXTRA_DIST += \
units/systemd-timesyncd.service.in
EXTRA_DIST += \
units/systemd-timesyncd.service.in
+
+nodist_pkgsysconf_DATA += \
+ src/timesync/timesyncd.conf
+
+EXTRA_DIST += \
+ src/timesync/timesyncd.conf.in
+
+CLEANFILES += \
+ src/timesync/timesyncd.conf
+
+dist_ntpunits_DATA = \
+ src/timesync/90-systemd.list
+
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-4763,7
+4788,8
@@
substitutions = \
'|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
'|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
'|PYTHON=$(PYTHON)|' \
'|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
'|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
'|PYTHON=$(PYTHON)|' \
- '|PYTHON_BINARY=$(PYTHON_BINARY)|'
+ '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
+ '|NTP_SERVERS=$(NTP_SERVERS)|'
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@
-4791,6
+4817,9
@@
src/%.policy.in: src/%.policy.in.in
%.rules: %.rules.in
$(SED_PROCESS)
%.rules: %.rules.in
$(SED_PROCESS)
+%.conf: %.conf.in
+ $(SED_PROCESS)
+
%.sh: %.sh.in
$(SED_PROCESS)
$(AM_V_GEN)chmod +x $@
%.sh: %.sh.in
$(SED_PROCESS)
$(AM_V_GEN)chmod +x $@