X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=20fd06f8267cf827c2d36923d56c3dfe296a8c62;hp=96e145b31d509de2c8b65e9e398595f215fe7b21;hb=84e3543ef4c4758621f8a304b14642072303ef82;hpb=5c546cb75e7380dfcc31e2c8770b605cbca501d4

diff --git a/Makefile.am b/Makefile.am
index 96e145b31..20fd06f82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,13 +17,22 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+# Dirs of external packages
+dbuspolicydir=@dbuspolicydir@
+dbussessionservicedir=@dbussessionservicedir@
+dbussystemservicedir=@dbussystemservicedir@
+dbusinterfacedir=@dbusinterfacedir@
 udevrulesdir=@udevrulesdir@
 
+# Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-systemunitdir=$(pkgdatadir)/system
 sessionunitdir=$(pkgdatadir)/session
-interfacedir=$(datadir)/dbus-1/interfaces
+
+# And these are the special ones for /
+rootdir=@rootdir@
+rootbindir=$(rootdir)/bin
+rootlibexecdir=$(rootdir)/lib/systemd
+systemunitdir=$(rootdir)/lib/systemd/system
 
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
@@ -33,22 +42,20 @@ AM_CPPFLAGS = \
 	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
 	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
 	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-	-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
-	-DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\" \
+	-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
+	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
 	-I $(top_srcdir)/src
 
-sbin_PROGRAMS = \
-	systemd
-
-bin_PROGRAMS = \
+rootbin_PROGRAMS = \
+	systemd \
 	systemctl
 
 if HAVE_GTK
-bin_PROGRAMS += \
+bin_PROGRAMS = \
 	systemadm
 endif
 
-pkglibexec_PROGRAMS = \
+rootlibexec_PROGRAMS = \
 	systemd-logger \
 	systemd-cgroups-agent \
 	systemd-initctl
@@ -62,10 +69,13 @@ noinst_PROGRAMS = \
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.conf
 
+dist_dbussystemservice_DATA = \
+	src/org.freedesktop.systemd1.service
+
 dist_udevrules_DATA = \
 	src/99-systemd.rules
 
-interface_DATA = \
+dbusinterface_DATA = \
 	org.freedesktop.systemd1.Manager.xml \
 	org.freedesktop.systemd1.Job.xml \
 	org.freedesktop.systemd1.Unit.xml \
@@ -82,6 +92,7 @@ interface_DATA = \
 
 dist_systemunit_DATA = \
 	units/emergency.service \
+	units/basic.target \
 	units/getty.target \
 	units/halt.target \
 	units/local-fs.target \
@@ -114,7 +125,7 @@ dist_systemunit_DATA = \
 	units/var-run.mount
 
 systemunit_DATA = \
-	units/basic.target \
+	units/sysinit.target \
 	units/getty@.service \
 	units/graphical.target \
 	units/multi-user.target \
@@ -130,7 +141,7 @@ sessionunit_DATA = \
 	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 \
@@ -154,6 +165,13 @@ dist_systemunit_DATA += \
 	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 \
@@ -181,6 +199,7 @@ COMMON_SOURCES = \
 	src/unit.c \
         src/job.c \
         src/manager.c \
+	src/path-lookup.c \
         src/load-fragment.c \
         src/service.c \
         src/automount.c \
@@ -276,7 +295,7 @@ test_engine_LDADD = $(systemd_LDADD)
 
 test_job_type_SOURCES = \
 	$(COMMON_SOURCES) \
-	src/test-engine.c
+	src/test-job-type.c
 
 test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
 test_job_type_LDADD = $(systemd_LDADD)
@@ -325,6 +344,13 @@ systemd_cgroups_agent_CPPFLAGS = \
 systemd_cgroups_agent_LDADD = \
 	$(DBUS_LIBS)
 
+systemctl_SOURCES = \
+	src/systemctl.c \
+	$(BASIC_SOURCES)
+
+systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS)
+systemctl_LDADD = $(DBUS_LIBS)
+
 VALAFLAGS = \
 	-g \
 	--save-temps \
@@ -340,13 +366,6 @@ VALA_CFLAGS = \
 	-Wno-unused-variable \
 	-Wno-unused-function
 
-systemctl_SOURCES = \
-	src/systemctl.vala \
-	src/systemd-interfaces.vala
-
-systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
-systemctl_LDADD = $(DBUSGLIB_LIBS)
-
 systemadm_SOURCES = \
 	src/systemadm.vala \
 	src/systemd-interfaces.vala
@@ -356,11 +375,10 @@ 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,@SYSTEMCTL\@,$(bindir)/systemctl,g' \
+		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
 		< $< > $@
 
 units/%: units/%.in Makefile
@@ -387,7 +405,7 @@ CLEANFILES = \
 	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 \
@@ -400,7 +418,6 @@ CLEANFILES = \
 if HAVE_VALAC
 CLEANFILES += \
 	src/systemd-interfaces.c \
-	src/systemctl.c \
 	src/systemadm.c
 endif
 
@@ -452,14 +469,14 @@ endif
 org.freedesktop.systemd1.%.xml: systemd
 	$(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
 
-CLEANFILES += $(interface_DATA)
+CLEANFILES += $(dbusinterface_DATA)
 
 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 \
@@ -477,10 +494,10 @@ install-data-hook:
 		$(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
 	( cd $(DESTDIR)$(sessionunitdir) && \
 		rm -f shutdown.target sockets.target local-fs.target swap.target && \
-		$(LN_S) ../system/shutdown.target shutdown.target && \
-		$(LN_S) ../system/sockets.target sockets.target && \
-		$(LN_S) ../system/local-fs.target local-fs.target && \
-		$(LN_S) ../system/swap.target swap.target )
+		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
+		$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
+		$(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
+		$(LN_S) $(systemunitdir)/swap.target swap.target )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f runlevel0.target runlevel1.target runlevel6.target && \
 		$(LN_S) poweroff.target runlevel0.target && \
@@ -505,21 +522,23 @@ 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 && \
-		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 \
 			sys-kernel-debug.automount \
-			sys-fs-fuse-connections.automount \
 			sys-kernel-security.automount && \
 		$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
 		$(LN_S) ../dev-mqueue.automount dev-mqueue.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 && \
-		$(LN_S) ../sys-fs-fuse-connections.automount sys-fs-fuse-connections.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 && \
@@ -546,4 +565,9 @@ if TARGET_GENTOO
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
+	--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)