X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=12118b1cc08e44e577c0ac8f81ccb6efdea44046;hp=7120636d9f369e415015c19bf064a99dd54e2e3b;hb=cca4aeeead1985f503d175eb1fcad9ed66f2e25d;hpb=a8f11321c209830a35edd0357e8def5d4437d854

diff --git a/Makefile.am b/Makefile.am
index 7120636d9..12118b1cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,7 @@ AM_CPPFLAGS = \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
 	-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
         -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-	-DRUNTIME_DIR=\"$(localstatedir)/run\" \
+	-DRUNTIME_DIR=\"/run\" \
 	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
 	-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
 	-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
@@ -106,14 +106,16 @@ rootbin_PROGRAMS = \
 	systemd-notify \
 	systemd-ask-password \
 	systemd-tty-ask-password-agent \
-	systemd-tmpfiles
-
-rootsbin_PROGRAMS = \
+	systemd-tmpfiles \
 	systemd-machine-id-setup
 
 bin_PROGRAMS = \
 	systemd-cgls \
-	systemd-stdio-bridge
+	systemd-stdio-bridge \
+        systemd-nspawn
+
+dist_bin_SCRIPTS = \
+        src/systemd-analyze
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -144,11 +146,14 @@ rootlibexec_PROGRAMS = \
 	systemd-detect-virt \
 	systemd-sysctl
 
+systemgenerator_PROGRAMS = \
+        systemd-getty-generator
+
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
 	systemd-cryptsetup
 
-systemgenerator_PROGRAMS = \
+systemgenerator_PROGRAMS += \
 	systemd-cryptsetup-generator
 endif
 
@@ -202,7 +207,14 @@ dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
 	tmpfiles.d/x11.conf
 
+if HAVE_SYSV_COMPAT
+dist_tmpfiles_DATA += \
+        tmpfiles.d/legacy.conf
+endif
+
 dist_systemunit_DATA = \
+	units/graphical.target \
+	units/multi-user.target \
 	units/emergency.service \
 	units/emergency.target \
 	units/sysinit.target \
@@ -227,7 +239,6 @@ dist_systemunit_DATA = \
 	units/sigpwr.target \
 	units/sockets.target \
 	units/swap.target \
-	units/dbus.target \
 	units/systemd-initctl.socket \
 	units/systemd-logger.socket \
 	units/systemd-shutdownd.socket \
@@ -256,14 +267,14 @@ dist_systemunit_DATA = \
 	units/systemd-tmpfiles-clean.timer \
 	units/quotaon.service \
 	units/systemd-ask-password-wall.path \
-	units/systemd-ask-password-console.path
+	units/systemd-ask-password-console.path \
+	units/syslog.target
 
 nodist_systemunit_DATA = \
 	units/getty@.service \
 	units/serial-getty@.service \
-	units/graphical.target \
+        units/console-shell.service \
 	units/remote-fs.target \
-	units/multi-user.target \
 	units/systemd-initctl.service \
 	units/systemd-logger.service \
 	units/systemd-shutdownd.service \
@@ -284,7 +295,6 @@ nodist_systemunit_DATA = \
 	units/systemd-ask-password-wall.service \
 	units/systemd-ask-password-console.service \
 	units/systemd-sysctl.service \
-	units/syslog.target \
 	units/halt.service \
 	units/poweroff.service \
 	units/reboot.service \
@@ -305,8 +315,7 @@ nodist_userunit_DATA = \
 EXTRA_DIST = \
 	units/getty@.service.m4 \
 	units/serial-getty@.service.m4 \
-	units/graphical.target.m4 \
-	units/multi-user.target.m4 \
+        units/console-shell.service.m4 \
 	units/remote-fs.target.m4 \
 	units/rescue.service.m4 \
 	units/systemd-initctl.service.in \
@@ -329,7 +338,6 @@ EXTRA_DIST = \
 	units/systemd-ask-password-wall.service.in \
 	units/systemd-ask-password-console.service.in \
 	units/systemd-sysctl.service.in \
-	units/syslog.target.in \
 	units/halt.service.in \
 	units/poweroff.service.in \
 	units/reboot.service.in \
@@ -339,7 +347,8 @@ EXTRA_DIST = \
 	units/fsck-root.service.in \
 	units/quotacheck.service.in \
 	systemd.pc.in \
-	introspect.awk
+	introspect.awk \
+	src/org.freedesktop.systemd1.policy.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -355,6 +364,11 @@ dist_systemunit_DATA += \
 	units/fedora/halt-local.service
 endif
 
+if TARGET_FRUGALWARE
+dist_systemunit_DATA += \
+	units/frugalware/display-manager.service
+endif
+
 if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
 	units/plymouth-start.service \
@@ -386,7 +400,7 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
 	systemd.pc
 
-dist_polkitpolicy_DATA = \
+polkitpolicy_DATA = \
 	src/org.freedesktop.systemd1.policy
 
 noinst_LTLIBRARIES = \
@@ -491,6 +505,7 @@ EXTRA_DIST += \
 	${libsystemd_core_la_SOURCES:.c=.h} \
 	${libsystemd_daemon_la_SOURCES:.c=.h} \
 	src/macro.h \
+        src/def.h \
 	src/ioprio.h \
 	src/missing.h \
 	src/list.h \
@@ -514,6 +529,7 @@ MANPAGES = \
 	man/systemctl.1 \
 	man/systemadm.1 \
 	man/systemd-cgls.1 \
+	man/systemd-nspawn.1 \
 	man/systemd-tmpfiles.8 \
 	man/systemd-notify.1 \
 	man/sd_notify.3 \
@@ -854,6 +870,16 @@ systemd_cryptsetup_generator_CFLAGS = \
 systemd_cryptsetup_generator_LDADD = \
 	libsystemd-basic.la
 
+systemd_getty_generator_SOURCES = \
+	src/getty-generator.c \
+	src/unit-name.c
+
+systemd_getty_generator_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_getty_generator_LDADD = \
+	libsystemd-basic.la
+
 systemd_user_sessions_SOURCES = \
 	src/user-sessions.c \
 	src/cgroup-util.c
@@ -982,6 +1008,17 @@ systemd_cgls_CFLAGS = \
 systemd_cgls_LDADD = \
 	libsystemd-basic.la
 
+systemd_nspawn_SOURCES = \
+	src/nspawn.c \
+	src/cgroup-util.c
+
+systemd_nspawn_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_nspawn_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la
+
 systemd_stdio_bridge_SOURCES = \
 	src/bridge.c
 
@@ -1069,7 +1106,7 @@ SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
                 -e 's,@rootbindir\@,$(rootbindir),g' \
-		-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
+                -e 's,@bindir\@,$(bindir),g' \
 		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
 		-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
 		-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
@@ -1090,6 +1127,9 @@ man/%: man/%.in Makefile
 %.pc: %.pc.in Makefile
 	$(SED_PROCESS)
 
+src/%.policy: src/%.policy.in Makefile
+	$(SED_PROCESS)
+
 M4_PROCESS_SYSTEM = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
@@ -1109,7 +1149,8 @@ CLEANFILES = \
 	$(nodist_userunit_DATA) \
 	$(nodist_man_MANS) \
 	${XML_IN_FILES:.xml.in=.html} \
-	$(pkgconfigdata_DATA)
+	$(pkgconfigdata_DATA) \
+	src/org.freedesktop.systemd1.policy
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1193,6 +1234,13 @@ CLEANFILES += \
 	$(dbusinterface_DATA)
 
 install-data-hook:
+	$(MKDIR_P) -m 0755 \
+                $(DESTDIR)$(sysconfdir)/modules-load.d \
+                $(DESTDIR)$(tmpfilesdir) \
+                $(DESTDIR)$(sysconfdir)/sysctl.d \
+                $(DESTDIR)$(systemshutdowndir) \
+                $(DESTDIR)$(systemgeneratordir) \
+                $(DESTDIR)$(usergeneratordir)
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(systemunitdir) \
 		$(DESTDIR)$(userunitdir) \
@@ -1294,10 +1342,6 @@ install-data-hook:
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-		rm -f quotaon.service quotacheck.service && \
-		$(LN_S) $(systemunitdir)/quotacheck.service quotacheck.service && \
-		$(LN_S) $(systemunitdir)/quotaon.service quotaon.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
 		rm -f remote-fs.target && \
 		$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
@@ -1375,8 +1419,9 @@ if TARGET_FEDORA
 		rm -f halt-local.service && \
 		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f display-manager.service && \
-		$(LN_S) prefdm.service display-manager.service )
+		rm -f display-manager.service single.service && \
+		$(LN_S) prefdm.service display-manager.service && \
+                $(LN_S) rescue.service single.service )
 	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
@@ -1391,8 +1436,10 @@ if TARGET_MANDRIVA
 		rm -f halt-local.service && \
 		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f display-manager.service && \
-		$(LN_S) prefdm.service display-manager.service )
+		rm -f display-manager.service dm.service single.service && \
+		$(LN_S) prefdm.service display-manager.service && \
+		$(LN_S) prefdm.service dm.service && \
+                $(LN_S) rescue.service single.service )
 	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )