service: ifdef (more) distro-specific compat logic

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eb63c5d56d2177ca9ba24a0ed6721cdcacae2e96..fa704ae8b4311f98893c868a98e98ed987aaba2b 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 \
@@ -334,10 +341,6 @@ dist_systemunit_DATA += \
        units/fedora/plymouth-halt.service
 endif
 
-if TARGET_GENTOO
-dist_systemunit_DATA += \
-       units/gentoo/xdm.service
-endif
 
 if TARGET_ARCH
 dist_systemunit_DATA += \
@@ -361,7 +364,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 +451,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 +461,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 +470,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 +606,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 \
@@ -635,16 +642,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 +659,7 @@ systemd_initctl_CFLAGS = \
 
 systemd_initctl_LDADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(DBUS_LIBS)
 
 systemd_update_utmp_SOURCES = \
@@ -681,14 +688,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 \
@@ -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 = \
@@ -966,7 +973,12 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
        --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 = \
@@ -984,8 +996,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 +1011,7 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
+       libsystemd-daemon.la \
        $(PAM_LIBS)
 
 SED_PROCESS = \
@@ -1309,14 +1321,6 @@ if TARGET_FEDORA
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
-if TARGET_GENTOO
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service && \
-               $(LN_S) xdm.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_DEBIAN_OR_UBUNTU
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f runlevel5.target && \
@@ -1339,8 +1343,3 @@ upload: all distcheck
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
-
-# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
-fedora: install
-       rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
-       rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount