X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=e1fe9e657f2308a1ba04cbed08deb667eb37a4f3;hb=739848d4f353288e4ed0abfcb894d581235c4c60;hp=6266a0ee0cbfbf76883cfa47dfe886f5dabe62a8;hpb=449ddb2d23a63ca4c8cd70d13a070fba87c1fb30;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 6266a0ee0..e1fe9e657 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,9 +73,9 @@ rootlibexec_PROGRAMS = \ systemd-update-utmp \ systemd-random-seed \ systemd-shutdownd \ - systemd-auto-console-getty \ systemd-modules-load \ - systemd-remount-api-vfs + systemd-remount-api-vfs \ + systemd-kmsg-syslogd noinst_PROGRAMS = \ test-engine \ @@ -143,6 +143,7 @@ dist_systemunit_DATA = \ units/systemd-initctl.socket \ units/systemd-logger.socket \ units/systemd-shutdownd.socket \ + units/systemd-kmsg-syslogd.socket \ units/dev-hugepages.automount \ units/dev-hugepages.mount \ units/dev-mqueue.automount \ @@ -161,6 +162,7 @@ dist_systemunit_DATA = \ units/hwclock-load.service \ units/hwclock-save.service \ units/sysctl.service \ + units/remount-rootfs.service \ units/printer.target \ units/bluetooth.target \ units/smartcard.target @@ -168,13 +170,14 @@ 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 \ units/systemd-initctl.service \ units/systemd-logger.service \ units/systemd-shutdownd.service \ - units/systemd-auto-console-getty.service \ + units/systemd-kmsg-syslogd.service \ units/systemd-modules-load.service \ units/systemd-remount-api-vfs.service \ units/systemd-update-utmp-runlevel.service \ @@ -193,13 +196,14 @@ 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 \ units/systemd-initctl.service.in \ units/systemd-logger.service.in \ units/systemd-shutdownd.service.in \ - units/systemd-auto-console-getty.service.in \ + units/systemd-kmsg-syslogd.service.in \ units/systemd-modules-load.service.in \ units/systemd-remount-api-vfs.service.in \ units/systemd-update-utmp-runlevel.service.in \ @@ -226,6 +230,18 @@ 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 \ + units/debian/umountfs.service \ + units/debian/umountnfs.service \ + units/debian/umountroot.service +endif + if TARGET_SUSE dist_systemunit_DATA += \ units/suse/halt.service \ @@ -568,18 +584,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 @@ -611,6 +615,17 @@ systemd_cgroups_agent_LDADD = \ libsystemd-basic.la \ $(DBUS_LIBS) +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 + systemctl_SOURCES = \ src/systemctl.c \ src/utmp-wtmp.c \ @@ -829,8 +844,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 ) @@ -880,14 +893,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 && \ @@ -952,11 +964,25 @@ if TARGET_GENTOO rm -f xdm.service && \ $(LN_S) $(systemunitdir)/xdm.service xdm.service ) endif +if TARGET_DEBIAN + $(MKDIR_P) -m 0755 \ + $(DESTDIR)$(systemunitdir)/umount.target.wants + ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \ + rm -f umountfs.service umountnfs.service umountroot.service && \ + $(LN_S) ../umountfs.service umountfs.service && \ + $(LN_S) ../umountnfs.service umountnfs.service && \ + $(LN_S) ../umountroot.service umountroot.service ) + ( cd $(DESTDIR)$(systemunitdir) && \ + rm -f runlevel5.target && \ + $(LN_S) multi-user.target runlevel5.target ) +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) \ @@ -968,7 +994,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/