chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: automatically turn paths and unescaped unit names into proper unit names
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 77b4aa74eed2e1f9dcaee9bc104a05e66f53e103..276c2265d6b0b747a0b558e89aa53c035d565a69 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-57,6
+57,7
@@
pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=$(sysconfdir)/bash_completion.d
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=$(sysconfdir)/bash_completion.d
+rpmmacrosdir=$(sysconfdir)/rpm
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
@@
-459,6
+460,7
@@
MANPAGES = \
man/systemd.exec.5 \
man/systemd.special.7 \
man/systemd.journal-fields.7 \
man/systemd.exec.5 \
man/systemd.special.7 \
man/systemd.journal-fields.7 \
+ man/kernel-command-line.7 \
man/daemon.7 \
man/runlevel.8 \
man/telinit.8 \
man/daemon.7 \
man/runlevel.8 \
man/telinit.8 \
@@
-885,8
+887,12
@@
org.freedesktop.systemd1.%.xml: systemd
pkgconfigdata_DATA = \
src/core/systemd.pc
pkgconfigdata_DATA = \
src/core/systemd.pc
+nodist_rpmmacros_DATA = \
+ src/core/macros.systemd
+
EXTRA_DIST += \
EXTRA_DIST += \
- src/core/systemd.pc.in
+ src/core/systemd.pc.in \
+ src/core/macros.systemd.in
# ------------------------------------------------------------------------------
noinst_PROGRAMS += \
# ------------------------------------------------------------------------------
noinst_PROGRAMS += \
@@
-900,7
+906,8
@@
noinst_PROGRAMS += \
test-env-replace \
test-strv \
test-install \
test-env-replace \
test-strv \
test-install \
- test-watchdog
+ test-watchdog \
+ test-unit-name
TESTS += \
test-job-type \
TESTS += \
test-job-type \
@@
-949,6
+956,12
@@
test_hostname_SOURCES = \
test_hostname_LDADD = \
libsystemd-core.la
test_hostname_LDADD = \
libsystemd-core.la
+test_unit_name_SOURCES = \
+ src/test/test-unit-name.c
+
+test_unit_name_LDADD = \
+ libsystemd-core.la
+
test_daemon_SOURCES = \
src/test/test-daemon.c
test_daemon_SOURCES = \
src/test/test-daemon.c
@@
-1418,6
+1431,9
@@
libudev_private_la_LIBADD = \
MANPAGES += \
man/udev.7 \
man/udevadm.8 \
MANPAGES += \
man/udev.7 \
man/udevadm.8 \
+ man/systemd-udevd.service.8
+
+MANPAGES_ALIAS += \
man/systemd-udevd.8
udev-confdirs:
man/systemd-udevd.8
udev-confdirs:
@@
-2372,39
+2388,24
@@
endif
# ------------------------------------------------------------------------------
if ENABLE_READAHEAD
# ------------------------------------------------------------------------------
if ENABLE_READAHEAD
-systemd_readahead_collect_SOURCES = \
+systemd_readahead_SOURCES = \
+ src/readahead/readahead.c \
src/readahead/readahead-collect.c \
src/readahead/readahead-collect.c \
- src/readahead/readahead-common.c \
- src/readahead/readahead-common.h
-
-systemd_readahead_collect_LDADD = \
- libsystemd-shared.la \
- libsystemd-daemon.la \
- libudev.la
-
-systemd_readahead_replay_SOURCES = \
src/readahead/readahead-replay.c \
src/readahead/readahead-replay.c \
+ src/readahead/readahead-analyze.c \
src/readahead/readahead-common.c \
src/readahead/readahead-common.h
src/readahead/readahead-common.c \
src/readahead/readahead-common.h
-systemd_readahead_
replay_
LDADD = \
+systemd_readahead_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
libudev.la
libsystemd-shared.la \
libsystemd-daemon.la \
libudev.la
-systemd_readahead_analyze_SOURCES = \
- src/readahead/readahead-analyze.c \
- src/readahead/readahead-common.h
-
pkginclude_HEADERS += \
src/systemd/sd-readahead.h
rootlibexec_PROGRAMS += \
pkginclude_HEADERS += \
src/systemd/sd-readahead.h
rootlibexec_PROGRAMS += \
- systemd-readahead-collect \
- systemd-readahead-replay
-
-bin_PROGRAMS += \
- systemd-readahead-analyze
+ systemd-readahead
dist_systemunit_DATA += \
units/systemd-readahead-drop.service \
dist_systemunit_DATA += \
units/systemd-readahead-drop.service \
@@
-3015,6
+3016,9
@@
sysctl.d/%: sysctl.d/%.in Makefile
%.pc: %.pc.in Makefile
$(SED_PROCESS)
%.pc: %.pc.in Makefile
$(SED_PROCESS)
+src/core/macros.%: src/core/macros.%.in Makefile
+ $(SED_PROCESS)
+
src/%.policy.in: src/%.policy.in.in Makefile
$(SED_PROCESS)
src/%.policy.in: src/%.policy.in.in Makefile
$(SED_PROCESS)