X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7e5d6d876460300a20a6eac473e0d5f9f5adbad8;hp=6a688b868730ed37fd3f5139d29c50473fe1fd2b;hb=80758717a6359cbe6048f43a17c2b53a3ca8c2fa;hpb=2f6a1ab18e8372ea9e77df4f1f9fdaac78396b10

diff --git a/Makefile.am b/Makefile.am
index 6a688b868..7e5d6d876 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
 systemunitdir=$(rootdir)/lib/systemd/system
 systemgeneratordir=$(rootdir)/lib/systemd/system-generators
+systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
@@ -62,6 +63,7 @@ AM_CPPFLAGS = \
 	-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
 	-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
 	-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
+	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
 	-I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -76,19 +78,27 @@ AM_CPPFLAGS += \
 	-DKBD_SETFONT=\"/usr/bin/setfont\" \
 	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_FRUGALWARE
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/usr/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
 	-DKBD_SETFONT=\"/bin/setfont\" \
 	-DDEFAULT_FONT=\"latarcyrheb-sun16\"
 endif
 endif
+endif
 
 rootbin_PROGRAMS = \
 	systemd \
 	systemctl \
 	systemd-notify \
 	systemd-ask-password \
-	systemd-tty-ask-password-agent
+	systemd-tty-ask-password-agent \
+	systemd-tmpfiles
 
 bin_PROGRAMS = \
 	systemd-cgls
@@ -114,12 +124,12 @@ rootlibexec_PROGRAMS = \
 	systemd-reply-password \
 	systemd-readahead-collect \
 	systemd-readahead-replay \
-	systemd-tmpfiles \
 	systemd-user-sessions \
 	systemd-fsck \
 	systemd-quotacheck \
 	systemd-timestamp \
 	systemd-ac-power \
+	systemd-detect-virt \
 	systemd-sysctl
 
 if HAVE_LIBCRYPTSETUP
@@ -226,6 +236,7 @@ dist_systemunit_DATA = \
 	units/hwclock-save.service \
 	units/remount-rootfs.service \
 	units/printer.target \
+	units/sound.target \
 	units/bluetooth.target \
 	units/smartcard.target \
 	units/systemd-readahead-done.timer \
@@ -324,20 +335,18 @@ if TARGET_FEDORA
 dist_systemunit_DATA += \
 	units/fedora/prefdm.service \
 	units/fedora/rc-local.service \
-	units/fedora/halt-local.service \
-	units/fedora/plymouth-start.service \
-	units/fedora/plymouth-read-write.service \
-	units/fedora/plymouth-quit.service \
-	units/fedora/plymouth-reboot.service \
-	units/fedora/plymouth-kexec.service \
-	units/fedora/plymouth-poweroff.service \
-	units/fedora/plymouth-halt.service
+	units/fedora/halt-local.service
 endif
 
-
-if TARGET_ARCH
+if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
-	units/arch/rc-local.service
+	units/plymouth-start.service \
+	units/plymouth-read-write.service \
+	units/plymouth-quit.service \
+	units/plymouth-reboot.service \
+	units/plymouth-kexec.service \
+	units/plymouth-poweroff.service \
+	units/plymouth-halt.service
 endif
 
 dist_doc_DATA = \
@@ -369,7 +378,8 @@ libsystemd_basic_la_SOURCES = \
 	src/conf-parser.c \
 	src/socket-util.c \
 	src/log.c \
-	src/ratelimit.c
+	src/ratelimit.c \
+	src/exit-status.c
 
 libsystemd_basic_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -397,7 +407,6 @@ libsystemd_core_la_SOURCES = \
 	src/load-dropin.c \
 	src/execute.c \
 	src/utmp-wtmp.c \
-	src/exit-status.c \
 	src/dbus.c \
 	src/dbus-manager.c \
 	src/dbus-unit.c \
@@ -479,6 +488,7 @@ MANPAGES = \
 	man/systemctl.1 \
 	man/systemadm.1 \
 	man/systemd-cgls.1 \
+	man/systemd-tmpfiles.8 \
 	man/systemd-notify.1 \
 	man/sd_notify.3 \
 	man/sd_readahead.3 \
@@ -625,7 +635,8 @@ test_env_replace_LDADD = \
 	libsystemd-basic.la
 
 test_strv_SOURCES = \
-	src/test-strv.c
+	src/test-strv.c \
+	src/specifier.c
 
 test_strv_CFLAGS = \
 	$(AM_CFLAGS)
@@ -773,6 +784,15 @@ systemd_ac_power_LDADD = \
 	libsystemd-basic.la \
 	$(UDEV_LIBS)
 
+systemd_detect_virt_SOURCES = \
+	src/detect-virt.c
+
+systemd_detect_virt_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_detect_virt_LDADD = \
+	libsystemd-basic.la
+
 systemd_cryptsetup_SOURCES = \
 	src/cryptsetup.c \
 	src/ask-password-api.c
@@ -818,7 +838,8 @@ systemd_vconsole_setup_LDADD = \
 
 systemd_remount_api_vfs_SOURCES = \
 	src/remount-api-vfs.c \
-	src/mount-setup.c
+	src/mount-setup.c \
+	src/exit-status.c
 
 systemd_remount_api_vfs_CFLAGS = \
 	$(AM_CFLAGS)
@@ -930,7 +951,6 @@ systemadm_SOURCES = \
 
 systemadm_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUSGLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
 	-Wno-unused-variable \
 	-Wno-unused-function \
@@ -938,13 +958,11 @@ systemadm_CFLAGS = \
 	-Wno-format-nonliteral
 
 systemadm_VALAFLAGS = \
-	--pkg=dbus-glib-1 \
 	--pkg=posix \
 	--pkg=gtk+-2.0 \
 	-g
 
 systemadm_LDADD = \
-	$(DBUSGLIB_LIBS) \
 	$(GTK_LIBS)
 
 systemd_gnome_ask_password_agent_SOURCES = \
@@ -952,7 +970,6 @@ systemd_gnome_ask_password_agent_SOURCES = \
 
 systemd_gnome_ask_password_agent_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUSGLIB_CFLAGS) \
 	$(LIBNOTIFY_CFLAGS) \
 	$(GTK_CFLAGS) \
 	-Wno-unused-variable \
@@ -961,7 +978,6 @@ systemd_gnome_ask_password_agent_CFLAGS = \
 	-Wno-format-nonliteral
 
 systemd_gnome_ask_password_agent_VALAFLAGS = \
-	--pkg=dbus-glib-1 \
 	--pkg=posix \
 	--pkg=gtk+-2.0 \
 	--pkg=linux \
@@ -975,7 +991,6 @@ systemd_gnome_ask_password_agent_VALAFLAGS += \
 	-g
 
 systemd_gnome_ask_password_agent_LDADD = \
-	$(DBUSGLIB_LIBS) \
 	$(LIBNOTIFY_LIBS) \
 	$(GTK_LIBS)
 
@@ -1193,22 +1208,21 @@ install-data-hook:
 			fsck-root.service \
 			remount-rootfs.service \
 			var-run.mount \
-			var-lock.mount \
-			cryptsetup.target && \
+			var-lock.mount && \
 		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
 		$(LN_S) ../fsck-root.service fsck-root.service && \
 		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
 		$(LN_S) ../var-run.mount var-run.mount && \
-		$(LN_S) ../var-lock.mount var-lock.mount && \
-		$(LN_S) ../cryptsetup.target )
+		$(LN_S) ../var-lock.mount var-lock.mount )
 	( cd $(DESTDIR)$(userunitdir) && \
-		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
+		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.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 && \
 		$(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
-		$(LN_S) $(systemunitdir)/printer.target printer.target)
+		$(LN_S) $(systemunitdir)/printer.target printer.target && \
+		$(LN_S) $(systemunitdir)/sound.target sound.target )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \
 		$(LN_S) poweroff.target runlevel0.target && \
@@ -1256,7 +1270,8 @@ install-data-hook:
 			systemd-random-seed-load.service \
 			systemd-tmpfiles-setup.service \
 			systemd-sysctl.service \
-			systemd-ask-password-console.path && \
+			systemd-ask-password-console.path \
+			cryptsetup.target && \
 		$(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 && \
@@ -1267,27 +1282,21 @@ install-data-hook:
 		$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
 		$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
 		$(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
-		$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
+		$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
+		$(LN_S) ../cryptsetup.target cryptsetup.target )
 	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
 		rm -f systemd-tmpfiles-clean.timer && \
 		$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
 	( cd $(DESTDIR)$(dbussessionservicedir) && \
 		rm -f org.freedesktop.systemd1.service && \
 		$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if TARGET_FEDORA
+if HAVE_PLYMOUTH
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
 		$(DESTDIR)$(systemunitdir)/reboot.target.wants \
 		$(DESTDIR)$(systemunitdir)/kexec.target.wants \
 		$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
-		$(DESTDIR)$(systemunitdir)/halt.target.wants \
-		$(DESTDIR)$(systemunitdir)/final.target.wants
-	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-		rm -f rc-local.service && \
-		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
-	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+		$(DESTDIR)$(systemunitdir)/halt.target.wants
 	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
 		rm -f plymouth-start.service plymouth-read-write.service && \
 		$(LN_S) ../plymouth-start.service plymouth-start.service && \
@@ -1307,6 +1316,16 @@ if TARGET_FEDORA
 	( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
 		rm -f plymouth-halt.service && \
 		$(LN_S) ../plymouth-halt.service plymouth-halt.service )
+endif
+
+if TARGET_FEDORA
+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+		rm -f rc-local.service && \
+		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+		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 )