units: Provide separate fsck.target for Debian

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 725685dfb0b2ebf944e67417cb148c75145ec966..944b8718ab051b60fe1ccf97cbc32b2090d6507e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,6 @@ rootlibexec_PROGRAMS = \
        systemd-update-utmp \
        systemd-random-seed \
        systemd-shutdownd \
-       systemd-auto-serial-getty \
        systemd-modules-load \
        systemd-remount-api-vfs \
        systemd-kmsg-syslogd
@@ -179,7 +178,6 @@ nodist_systemunit_DATA = \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
        units/systemd-kmsg-syslogd.service \
-       units/systemd-auto-serial-getty.service \
        units/systemd-modules-load.service \
        units/systemd-remount-api-vfs.service \
        units/systemd-update-utmp-runlevel.service \
@@ -206,7 +204,6 @@ EXTRA_DIST = \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-kmsg-syslogd.service.in \
-       units/systemd-auto-serial-getty.service.in \
        units/systemd-modules-load.service.in \
        units/systemd-remount-api-vfs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
@@ -233,6 +230,15 @@ dist_systemunit_DATA += \
        units/fedora/plymouth-halt.service
 endif
 
+if TARGET_DEBIAN
+dist_systemunit_DATA += \
+       units/debian/halt.service \
+       units/debian/killall.service \
+       units/debian/poweroff.service \
+       units/debian/reboot.service \
+       units/debian/fsck.target
+endif
+
 if TARGET_SUSE
 dist_systemunit_DATA += \
        units/suse/halt.service \
@@ -575,18 +581,6 @@ systemd_shutdownd_CFLAGS = \
 systemd_shutdownd_LDADD = \
        libsystemd-basic.la
 
-systemd_auto_serial_getty_SOURCES = \
-       src/auto-serial-getty.c \
-       src/dbus-common.c
-
-systemd_auto_serial_getty_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_auto_serial_getty_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS)
-
 systemd_modules_load_SOURCES = \
        src/modules-load.c
 
@@ -896,14 +890,13 @@ install-data-hook:
                $(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \
                $(LN_S) $(systemunitdir)/rescue.target kbrequest.target )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-               rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service systemd-auto-serial-getty.service && \
+               rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty2.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty3.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service && \
-               $(LN_S) $(systemunitdir)/systemd-auto-serial-getty.service systemd-auto-serial-getty.service )
+               $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f getty.target remote-fs.target && \
                $(LN_S) $(systemunitdir)/getty.target getty.target && \
@@ -969,10 +962,12 @@ if TARGET_GENTOO
                $(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
 if !TARGET_SUSE
+if !TARGET_DEBIAN
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f fsck.target && \
                $(LN_S) sysinit.target fsck.target )
 endif
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@ -984,7 +979,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-rootdir=$$dc_install_base/$(rootdir)
 
 upload: all distcheck
-       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/
+       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
        scp man/*.html tango:public/systemd-man/