X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=55b6dc8519ea084dd0b1a3effcde4121935d645f;hp=bf329e5083d20d32864687200cf60f7e5ce3e859;hb=e43ac8788b340a5d01c9c7e4c93c70d6b06a316d;hpb=e59077036bcf5a041e336f04cb0d2f7d18d489a1 diff --git a/Makefile.am b/Makefile.am index bf329e508..55b6dc851 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,8 +73,9 @@ rootlibexec_PROGRAMS = \ systemd-update-utmp \ systemd-random-seed \ systemd-shutdownd \ - systemd-auto-console-getty \ - systemd-modules-load + systemd-modules-load \ + systemd-remount-api-vfs \ + systemd-kmsg-syslogd noinst_PROGRAMS = \ test-engine \ @@ -128,6 +129,7 @@ dist_systemunit_DATA = \ units/network.target \ units/nss-lookup.target \ units/mail-transfer-agent.target \ + units/http-daemon.target \ units/poweroff.target \ units/reboot.target \ units/rescue.target \ @@ -142,6 +144,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 \ @@ -160,6 +163,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 @@ -167,14 +171,16 @@ 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 \ units/systemd-update-utmp-shutdown.service \ units/systemd-random-seed-save.service \ @@ -191,14 +197,16 @@ 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 \ units/systemd-update-utmp-shutdown.service.in \ units/systemd-random-seed-save.service.in \ @@ -223,6 +231,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 \ @@ -299,6 +319,7 @@ libsystemd_core_la_SOURCES = \ src/path.c \ src/load-dropin.c \ src/execute.c \ + src/exit-status.c \ src/dbus.c \ src/dbus-manager.c \ src/dbus-unit.c \ @@ -564,18 +585,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 @@ -585,6 +594,16 @@ systemd_modules_load_CFLAGS = \ systemd_modules_load_LDADD = \ libsystemd-basic.la +systemd_remount_api_vfs_SOURCES = \ + src/remount-api-vfs.c \ + src/mount-setup.c + +systemd_remount_api_vfs_CFLAGS = \ + $(AM_CFLAGS) + +systemd_remount_api_vfs_LDADD = \ + libsystemd-basic.la + systemd_cgroups_agent_SOURCES = \ src/cgroups-agent.c \ src/dbus-common.c @@ -597,6 +616,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 \ @@ -604,7 +634,8 @@ systemctl_SOURCES = \ src/path-lookup.c \ src/sd-daemon.c \ src/cgroup-show.c \ - src/cgroup-util.c + src/cgroup-util.c \ + src/exit-status.c systemctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -814,8 +845,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 ) @@ -865,14 +894,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 && \ @@ -937,11 +965,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) \ @@ -953,7 +995,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/