plymouth: move plymouth out of TARGET_FEDORA

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d7a279c152297ce7586961d5a5026ec3d602e8a2..f6ad8091bfcff3a7d0273c1d58c4f05f92478d68 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,12 +76,19 @@ 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 \
@@ -324,24 +331,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
-endif
-
-if TARGET_GENTOO
-dist_systemunit_DATA += \
-       units/gentoo/xdm.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 = \
@@ -361,7 +362,8 @@ dist_polkitpolicy_DATA = \
 
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
-       libsystemd-core.la
+       libsystemd-core.la \
+       libsystemd-daemon.la
 
 libsystemd_basic_la_SOURCES = \
        src/util.c \
@@ -447,6 +449,9 @@ libsystemd_core_la_LIBADD = \
        $(PAM_LIBS) \
        $(AUDIT_LIBS)
 
+libsystemd_daemon_la_SOURCES = \
+       src/sd-daemon.c
+
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't
 # list the .h files as dependencies if we want make dist to work.
@@ -454,6 +459,7 @@ libsystemd_core_la_LIBADD = \
 EXTRA_DIST += \
        ${libsystemd_basic_la_SOURCES:.c=.h} \
        ${libsystemd_core_la_SOURCES:.c=.h} \
+       ${libsystemd_daemon_la_SOURCES:.c=.h} \
        src/macro.h \
        src/ioprio.h \
        src/missing.h \
@@ -462,7 +468,6 @@ EXTRA_DIST += \
        src/linux/auto_dev-ioctl.h \
        src/linux/fanotify.h \
        src/initreq.h \
-       src/sd-daemon.h \
        src/sd-readahead.h \
        src/special.h \
        src/dbus-common.h \
@@ -599,11 +604,11 @@ test_hostname_LDADD = \
        libsystemd-basic.la
 
 test_daemon_SOURCES = \
-       src/test-daemon.c \
-       src/sd-daemon.c
+       src/test-daemon.c
 
 test_daemon_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
        src/test-cgroup.c \
@@ -625,7 +630,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)
@@ -635,16 +641,15 @@ test_strv_LDADD = \
 
 systemd_logger_SOURCES = \
        src/logger.c \
-       src/sd-daemon.c \
        src/tcpwrap.c
 
 systemd_logger_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(LIBWRAP_LIBS)
 
 systemd_initctl_SOURCES = \
        src/initctl.c \
-       src/sd-daemon.c \
        src/dbus-common.c
 
 systemd_initctl_CFLAGS = \
@@ -653,6 +658,7 @@ systemd_initctl_CFLAGS = \
 
 systemd_initctl_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(DBUS_LIBS)
 
 systemd_update_utmp_SOURCES = \
@@ -681,14 +687,14 @@ systemd_random_seed_LDADD = \
 
 systemd_shutdownd_SOURCES = \
        src/utmp-wtmp.c \
-       src/sd-daemon.c \
        src/shutdownd.c
 
 systemd_shutdownd_CFLAGS = \
        $(AM_CFLAGS)
 
 systemd_shutdownd_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-daemon.la
 
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
@@ -818,7 +824,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)
@@ -840,21 +847,20 @@ systemd_cgroups_agent_LDADD = \
 
 systemd_kmsg_syslogd_SOURCES = \
        src/kmsg-syslogd.c \
-       src/sd-daemon.c \
        src/fdset.c
 
 systemd_kmsg_syslogd_CFLAGS = \
        $(AM_CFLAGS)
 
 systemd_kmsg_syslogd_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-daemon.la
 
 systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
        src/dbus-common.c \
        src/path-lookup.c \
-       src/sd-daemon.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
        src/exit-status.c \
@@ -866,15 +872,16 @@ systemctl_CFLAGS = \
 
 systemctl_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
        src/notify.c \
-       src/sd-daemon.c \
        src/sd-readahead.c
 
 systemd_notify_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       libsystemd-daemon.la
 
 systemd_ask_password_SOURCES = \
        src/ask-password.c \
@@ -891,7 +898,6 @@ systemd_reply_password_LDADD = \
 
 systemd_readahead_collect_SOURCES = \
        src/readahead-collect.c \
-       src/sd-daemon.c \
        src/readahead-common.c
 
 systemd_readahead_collect_CFLAGS = \
@@ -899,11 +905,11 @@ systemd_readahead_collect_CFLAGS = \
 
 systemd_readahead_collect_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(UDEV_LIBS)
 
 systemd_readahead_replay_SOURCES = \
        src/readahead-replay.c \
-       src/sd-daemon.c \
        src/readahead-common.c
 
 systemd_readahead_replay_CFLAGS = \
@@ -911,6 +917,7 @@ systemd_readahead_replay_CFLAGS = \
 
 systemd_readahead_replay_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(UDEV_LIBS)
 
 systemd_cgls_SOURCES = \
@@ -930,7 +937,6 @@ systemadm_SOURCES = \
 
 systemadm_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUSGLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        -Wno-unused-variable \
        -Wno-unused-function \
@@ -938,13 +944,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 +956,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,16 +964,19 @@ 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 \
        --pkg=gio-unix-2.0 \
-       --pkg=libnotify \
+       --pkg=libnotify
+if LIBNOTIFY07
+systemd_gnome_ask_password_agent_VALAFLAGS += \
+       -D LIBNOTIFY07
+endif
+systemd_gnome_ask_password_agent_VALAFLAGS += \
        -g
 
 systemd_gnome_ask_password_agent_LDADD = \
-       $(DBUSGLIB_LIBS) \
        $(LIBNOTIFY_LIBS) \
        $(GTK_LIBS)
 
@@ -984,8 +990,7 @@ systemd_tty_ask_password_agent_LDADD = \
 
 pam_systemd_la_SOURCES = \
        src/pam-module.c \
-       src/cgroup-util.c \
-       src/sd-daemon.c
+       src/cgroup-util.c
 
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS)
@@ -1000,6 +1005,7 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(PAM_LIBS)
 
 SED_PROCESS = \
@@ -1188,14 +1194,12 @@ 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 && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -1251,7 +1255,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 && \
@@ -1262,27 +1267,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 && \
@@ -1302,17 +1301,19 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
                rm -f plymouth-halt.service && \
                $(LN_S) ../plymouth-halt.service plymouth-halt.service )
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service && \
-               $(LN_S) prefdm.service display-manager.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
-if TARGET_GENTOO
+
+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) xdm.service display-manager.service )
+               $(LN_S) prefdm.service display-manager.service )
        ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )