tmpfiles: take names of tmpfiles configuration files on the command line

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3c10167c63e5165f4b86b2789a76ac325c9039d3..537050437ba86ca6eee02d13098f3fe828ea127e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -233,6 +233,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 \
@@ -331,20 +332,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 = \
@@ -633,8 +632,7 @@ test_env_replace_LDADD = \
 
 test_strv_SOURCES = \
        src/test-strv.c \
-       src/specifier.c \
-       src/specifier.h
+       src/specifier.c
 
 test_strv_CFLAGS = \
        $(AM_CFLAGS)
@@ -827,7 +825,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)
@@ -939,7 +938,6 @@ systemadm_SOURCES = \
 
 systemadm_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUSGLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        -Wno-unused-variable \
        -Wno-unused-function \
@@ -947,13 +945,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 = \
@@ -961,7 +957,6 @@ systemd_gnome_ask_password_agent_SOURCES = \
 
 systemd_gnome_ask_password_agent_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUSGLIB_CFLAGS) \
        $(LIBNOTIFY_CFLAGS) \
        $(GTK_CFLAGS) \
        -Wno-unused-variable \
@@ -970,7 +965,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 \
@@ -984,7 +978,6 @@ systemd_gnome_ask_password_agent_VALAFLAGS += \
        -g
 
 systemd_gnome_ask_password_agent_LDADD = \
-       $(DBUSGLIB_LIBS) \
        $(LIBNOTIFY_LIBS) \
        $(GTK_LIBS)
 
@@ -1202,22 +1195,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 && \
@@ -1265,7 +1257,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 && \
@@ -1276,27 +1269,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 && \
@@ -1316,6 +1303,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 )