work around busted capability.h

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aa2998d99d3325dcc4e8d0e0904f8689f9c23aad..d93442a4ad25448ed2ff13e66f85ca7f7d400646 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,6 @@ rootlibexec_PROGRAMS = \
        systemd-update-utmp \
        systemd-random-seed \
        systemd-shutdownd \
-       systemd-auto-console-getty \
        systemd-modules-load \
        systemd-remount-api-vfs \
        systemd-kmsg-syslogd
@@ -171,6 +170,7 @@ dist_systemunit_DATA = \
 nodist_systemunit_DATA = \
        units/sysinit.target \
        units/getty@.service \
+       units/serial-getty@.service \
        units/graphical.target \
        units/remote-fs.target \
        units/multi-user.target \
@@ -178,7 +178,6 @@ nodist_systemunit_DATA = \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
        units/systemd-kmsg-syslogd.service \
-       units/systemd-auto-console-getty.service \
        units/systemd-modules-load.service \
        units/systemd-remount-api-vfs.service \
        units/systemd-update-utmp-runlevel.service \
@@ -197,6 +196,7 @@ nodist_sessionunit_DATA = \
 EXTRA_DIST = \
        units/sysinit.target.m4 \
        units/getty@.service.m4 \
+       units/serial-getty@.service.m4 \
        units/graphical.target.m4 \
        units/multi-user.target.m4 \
        units/remote-fs.target.m4 \
@@ -204,7 +204,6 @@ EXTRA_DIST = \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-kmsg-syslogd.service.in \
-       units/systemd-auto-console-getty.service.in \
        units/systemd-modules-load.service.in \
        units/systemd-remount-api-vfs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
@@ -573,18 +572,6 @@ systemd_shutdownd_CFLAGS = \
 systemd_shutdownd_LDADD = \
        libsystemd-basic.la
 
-systemd_auto_console_getty_SOURCES = \
-       src/auto-console-getty.c \
-       src/dbus-common.c
-
-systemd_auto_console_getty_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_auto_console_getty_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS)
-
 systemd_modules_load_SOURCES = \
        src/modules-load.c
 
@@ -845,8 +832,6 @@ install-data-hook:
                $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/session \
                $(DESTDIR)$(sysconfdir)/xdg/systemd
-       $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \
-               echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway."
        ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
                rm -f session && \
                $(LN_S) $(pkgsysconfdir)/session session )
@@ -896,14 +881,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-console-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-console-getty.service systemd-auto-console-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 && \
@@ -984,7 +968,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/