chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: fix help regarding --unit/systemd.unit=
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 5f880afe0045be08336c09f36474bd39b456152f..d8757868e85b7bc90d10d39a6c30a73115bb062d 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-18,9
+18,11
@@
ACLOCAL_AMFLAGS = -I m4
# Dirs of external packages
ACLOCAL_AMFLAGS = -I m4
# Dirs of external packages
-dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+dbuspolicydir=@dbuspolicydir@
+dbussessionservicedir=@dbussessionservicedir@
+dbussystemservicedir=@dbussystemservicedir@
+dbusinterfacedir=@dbusinterfacedir@
udevrulesdir=@udevrulesdir@
udevrulesdir=@udevrulesdir@
-interfacedir=$(datadir)/dbus-1/interfaces
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
@@
-28,7
+30,6
@@
sessionunitdir=$(pkgdatadir)/session
# And these are the special ones for /
rootdir=@rootdir@
# And these are the special ones for /
rootdir=@rootdir@
-rootsbindir=$(rootdir)/sbin
rootbindir=$(rootdir)/bin
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
rootbindir=$(rootdir)/bin
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
@@
-42,17
+43,18
@@
AM_CPPFLAGS = \
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
- -DSYSTEMD_BINARY_PATH=\"$(root
s
bindir)/systemd\" \
+ -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
-I $(top_srcdir)/src
-I $(top_srcdir)/src
-rootsbin_PROGRAMS = \
- systemd
-
rootbin_PROGRAMS = \
rootbin_PROGRAMS = \
+ systemd \
systemctl
systemctl
-if HAVE_GTK
bin_PROGRAMS = \
bin_PROGRAMS = \
+ systemd-install
+
+if HAVE_GTK
+bin_PROGRAMS += \
systemadm
endif
systemadm
endif
@@
-70,10
+72,13
@@
noinst_PROGRAMS = \
dist_dbuspolicy_DATA = \
src/org.freedesktop.systemd1.conf
dist_dbuspolicy_DATA = \
src/org.freedesktop.systemd1.conf
+dist_dbussystemservice_DATA = \
+ src/org.freedesktop.systemd1.service
+
dist_udevrules_DATA = \
src/99-systemd.rules
dist_udevrules_DATA = \
src/99-systemd.rules
-interface_DATA = \
+
dbus
interface_DATA = \
org.freedesktop.systemd1.Manager.xml \
org.freedesktop.systemd1.Job.xml \
org.freedesktop.systemd1.Unit.xml \
org.freedesktop.systemd1.Manager.xml \
org.freedesktop.systemd1.Job.xml \
org.freedesktop.systemd1.Unit.xml \
@@
-90,6
+95,7
@@
interface_DATA = \
dist_systemunit_DATA = \
units/emergency.service \
dist_systemunit_DATA = \
units/emergency.service \
+ units/basic.target \
units/getty.target \
units/halt.target \
units/local-fs.target \
units/getty.target \
units/halt.target \
units/local-fs.target \
@@
-122,7
+128,7
@@
dist_systemunit_DATA = \
units/var-run.mount
systemunit_DATA = \
units/var-run.mount
systemunit_DATA = \
- units/
basic
.target \
+ units/
sysinit
.target \
units/getty@.service \
units/graphical.target \
units/multi-user.target \
units/getty@.service \
units/graphical.target \
units/multi-user.target \
@@
-138,7
+144,7
@@
sessionunit_DATA = \
units/session/exit.service
EXTRA_DIST = \
units/session/exit.service
EXTRA_DIST = \
- units/
basic
.target.m4 \
+ units/
sysinit
.target.m4 \
units/getty@.service.m4 \
units/graphical.target.m4 \
units/multi-user.target.m4 \
units/getty@.service.m4 \
units/graphical.target.m4 \
units/multi-user.target.m4 \
@@
-162,6
+168,13
@@
dist_systemunit_DATA += \
units/fedora/sysinit.service
endif
units/fedora/sysinit.service
endif
+if TARGET_SUSE
+dist_systemunit_DATA += \
+ units/suse/halt.service \
+ units/suse/poweroff.service \
+ units/suse/reboot.service
+endif
+
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/halt.service \
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/halt.service \
@@
-189,6
+202,7
@@
COMMON_SOURCES = \
src/unit.c \
src/job.c \
src/manager.c \
src/unit.c \
src/job.c \
src/manager.c \
+ src/path-lookup.c \
src/load-fragment.c \
src/service.c \
src/automount.c \
src/load-fragment.c \
src/service.c \
src/automount.c \
@@
-264,8
+278,8
@@
systemd_SOURCES = \
$(COMMON_SOURCES) \
src/main.c
$(COMMON_SOURCES) \
src/main.c
-systemd_C
PP
FLAGS = \
- $(AM_C
PP
FLAGS) \
+systemd_CFLAGS = \
+ $(AM_CFLAGS) \
$(DBUS_CFLAGS) \
$(UDEV_CFLAGS) \
$(CGROUP_CFLAGS)
$(DBUS_CFLAGS) \
$(UDEV_CFLAGS) \
$(CGROUP_CFLAGS)
@@
-279,14
+293,14
@@
test_engine_SOURCES = \
$(COMMON_SOURCES) \
src/test-engine.c
$(COMMON_SOURCES) \
src/test-engine.c
-test_engine_C
PPFLAGS = $(systemd_CPP
FLAGS)
+test_engine_C
FLAGS = $(systemd_C
FLAGS)
test_engine_LDADD = $(systemd_LDADD)
test_job_type_SOURCES = \
$(COMMON_SOURCES) \
test_engine_LDADD = $(systemd_LDADD)
test_job_type_SOURCES = \
$(COMMON_SOURCES) \
- src/test-
engin
e.c
+ src/test-
job-typ
e.c
-test_job_type_C
PPFLAGS = $(systemd_CPP
FLAGS)
+test_job_type_C
FLAGS = $(systemd_C
FLAGS)
test_job_type_LDADD = $(systemd_LDADD)
test_ns_SOURCES = \
test_job_type_LDADD = $(systemd_LDADD)
test_ns_SOURCES = \
@@
-294,7
+308,7
@@
test_ns_SOURCES = \
src/test-ns.c \
src/namespace.c
src/test-ns.c \
src/namespace.c
-test_ns_C
PPFLAGS = $(systemd_CPP
FLAGS)
+test_ns_C
FLAGS = $(systemd_C
FLAGS)
test_ns_LDADD = $(systemd_LDADD)
test_loopback_SOURCES = \
test_ns_LDADD = $(systemd_LDADD)
test_loopback_SOURCES = \
@@
-302,7
+316,7
@@
test_loopback_SOURCES = \
src/test-loopback.c \
src/loopback-setup.c
src/test-loopback.c \
src/loopback-setup.c
-test_loopback_C
PPFLAGS = $(systemd_CPP
FLAGS)
+test_loopback_C
FLAGS = $(systemd_C
FLAGS)
test_loopback_LDADD = $(systemd_LDADD)
systemd_logger_SOURCES = \
test_loopback_LDADD = $(systemd_LDADD)
systemd_logger_SOURCES = \
@@
-315,8
+329,8
@@
systemd_initctl_SOURCES = \
src/initctl.c \
src/sd-daemon.c
src/initctl.c \
src/sd-daemon.c
-systemd_initctl_C
PP
FLAGS = \
- $(AM_C
PP
FLAGS) \
+systemd_initctl_CFLAGS = \
+ $(AM_CFLAGS) \
$(DBUS_CFLAGS)
systemd_initctl_LDADD = \
$(DBUS_CFLAGS)
systemd_initctl_LDADD = \
@@
-326,49
+340,55
@@
systemd_cgroups_agent_SOURCES = \
$(BASIC_SOURCES) \
src/cgroups-agent.c
$(BASIC_SOURCES) \
src/cgroups-agent.c
-systemd_cgroups_agent_C
PP
FLAGS = \
- $(AM_C
PP
FLAGS) \
+systemd_cgroups_agent_CFLAGS = \
+ $(AM_CFLAGS) \
$(DBUS_CFLAGS)
systemd_cgroups_agent_LDADD = \
$(DBUS_LIBS)
$(DBUS_CFLAGS)
systemd_cgroups_agent_LDADD = \
$(DBUS_LIBS)
-VALAFLAGS = \
- -g \
- --save-temps \
- --pkg=dbus-glib-1 \
- --pkg=posix
-
-if HAVE_GTK
-VALAFLAGS += \
- --pkg=gtk+-2.0
-endif
+systemctl_SOURCES = \
+ src/systemctl.c \
+ $(BASIC_SOURCES)
-VALA_CFLAGS = \
- -Wno-unused-variable \
- -Wno-unused-function
+systemctl_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+systemctl_LDADD = $(DBUS_LIBS)
-systemctl_SOURCES = \
- src/systemctl.vala \
- src/systemd-interfaces.vala
+systemd_install_SOURCES = \
+ src/install.c \
+ src/path-lookup.c \
+ $(BASIC_SOURCES)
-systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
-system
ctl_LDADD = $(DBUSGLIB_LIB
S)
+# We don't really link here against D-Bus, however we indirectly include D-Bus header files
+system
d_install_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAG
S)
systemadm_SOURCES = \
src/systemadm.vala \
src/systemd-interfaces.vala
systemadm_SOURCES = \
src/systemadm.vala \
src/systemd-interfaces.vala
-systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
+systemadm_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUSGLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ -Wno-unused-variable \
+ -Wno-unused-function \
+ -Wno-shadow \
+ -Wno-format-nonliteral
+
+systemadm_VALAFLAGS = \
+ --pkg=dbus-glib-1 \
+ --pkg=posix \
+ --pkg=gtk+-2.0 \
+ -g
+
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
- -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
- -e 's,@SYSTEMCTL\@,$(bindir)/systemctl,g' \
+ -e 's,@SYSTEMCTL\@,$(
root
bindir)/systemctl,g' \
< $< > $@
units/%: units/%.in Makefile
< $< > $@
units/%: units/%.in Makefile
@@
-395,7
+415,7
@@
CLEANFILES = \
units/systemd-initctl.service \
units/systemd-logger.service \
units/syslog.target \
units/systemd-initctl.service \
units/systemd-logger.service \
units/syslog.target \
- units/
basic
.target \
+ units/
sysinit
.target \
units/getty@.service \
units/graphical.target \
units/multi-user.target \
units/getty@.service \
units/graphical.target \
units/multi-user.target \
@@
-408,7
+428,6
@@
CLEANFILES = \
if HAVE_VALAC
CLEANFILES += \
src/systemd-interfaces.c \
if HAVE_VALAC
CLEANFILES += \
src/systemd-interfaces.c \
- src/systemctl.c \
src/systemadm.c
endif
src/systemadm.c
endif
@@
-460,14
+479,14
@@
endif
org.freedesktop.systemd1.%.xml: systemd
$(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
org.freedesktop.systemd1.%.xml: systemd
$(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
-CLEANFILES += $(interface_DATA)
+CLEANFILES += $(
dbus
interface_DATA)
install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(sessionunitdir) \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(sessionunitdir) \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
- $(DESTDIR)$(systemunitdir)/
basic
.target.wants \
+ $(DESTDIR)$(systemunitdir)/
sysinit
.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system \
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system \
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
@@
-513,9
+532,10
@@
install-data-hook:
$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
- rm -f getty.target && \
- $(LN_S) $(systemunitdir)/getty.target getty.target )
- ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+ rm -f getty.target remote-fs.target && \
+ $(LN_S) $(systemunitdir)/getty.target getty.target && \
+ $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
+ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f dev-hugepages.automount \
dev-mqueue.automount \
proc-sys-fs-binfmt_misc.automount \
rm -f dev-hugepages.automount \
dev-mqueue.automount \
proc-sys-fs-binfmt_misc.automount \
@@
-526,6
+546,9
@@
install-data-hook:
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
$(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount )
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
$(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount )
+ ( cd $(DESTDIR)$(dbussessionservicedir) && \
+ rm -f org.freedesktop.systemd1.service && \
+ $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
if TARGET_FEDORA
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
rm -f display-manager.service && \
if TARGET_FEDORA
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
rm -f display-manager.service && \
@@
-552,5
+575,9
@@
if TARGET_GENTOO
endif
DISTCHECK_CONFIGURE_FLAGS = \
endif
DISTCHECK_CONFIGURE_FLAGS = \
+ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
+ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
+ --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
+ --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-rootdir=$$dc_install_base/$(rootdir)
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-rootdir=$$dc_install_base/$(rootdir)