chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: add cgroup_bonding_to_string() call
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index dca7bc946c30eee846ff45154cf0f01a85dde836..8cad1420e0f239ef17b328c808d11b558aafc70f 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-19,15
+19,19
@@
ACLOCAL_AMFLAGS = -I m4
pkgsysconfdir=$(sysconfdir)/systemd
dbuspolicydir=$(sysconfdir)/dbus-1/system.d
pkgsysconfdir=$(sysconfdir)/systemd
dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+udevrulesdir=/lib/udev/rules.d
+
+systemunitdir=$(pkgdatadir)/system
+sessionunitdir=$(pkgdatadir)/system
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
- -DSYSTEM_DATA_UNIT_PATH=\"$(
pkgdatadir)/system
\" \
+ -DSYSTEM_DATA_UNIT_PATH=\"$(
systemunitdir)
\" \
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
- -DSESSION_DATA_UNIT_PATH=\"$(
pkgdatadir)/session
\" \
+ -DSESSION_DATA_UNIT_PATH=\"$(
sessionunitdir)
\" \
-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\"
sbin_PROGRAMS = \
-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\"
sbin_PROGRAMS = \
@@
-49,8
+53,24
@@
noinst_PROGRAMS = \
dbuspolicy_DATA = \
org.freedesktop.systemd1.conf
dbuspolicy_DATA = \
org.freedesktop.systemd1.conf
+udevrules_DATA = \
+ 99-systemd.rules
+
+systemunit_DATA = \
+ units/emergency.service \
+ systemd-initctl.service \
+ units/systemd-initctl.socket \
+ systemd-logger.service \
+ units/systemd-logger.socket
+
EXTRA_DIST = \
EXTRA_DIST = \
- org.freedesktop.systemd1.conf
+ org.freedesktop.systemd1.conf \
+ 99-systemd.rules \
+ units/emergency.service \
+ units/systemd-initctl.service.in \
+ units/systemd-initctl.socket \
+ units/systemd-logger.service.in \
+ units/systemd-logger.socket
BASIC_SOURCES= \
util.c \
BASIC_SOURCES= \
util.c \
@@
-115,7
+135,11
@@
COMMON_SOURCES= \
hostname-setup.c \
hostname-setup.h \
utmp-wtmp.c \
hostname-setup.c \
hostname-setup.h \
utmp-wtmp.c \
- utmp-wtmp.h
+ utmp-wtmp.h \
+ specifier.c \
+ specifier.h \
+ unit-name.c \
+ unit-name.h
systemd_SOURCES = \
$(COMMON_SOURCES) \
systemd_SOURCES = \
$(COMMON_SOURCES) \
@@
-188,8
+212,15
@@
systemadm_SOURCES = \
systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
+systemd-initctl.service: units/systemd-initctl.service.in Makefile
+ sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+
+systemd-logger.service: units/systemd-logger.service.in Makefile
+ sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+
CLEANFILES = \
systemd-interfaces.c \
systemctl.c \
systemadm.c \
CLEANFILES = \
systemd-interfaces.c \
systemctl.c \
systemadm.c \
- systemd-cgroups-agent
+ systemd-initctl.service \
+ systemd-logger.service