X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=b6041b5d1cff7fc96dbbcc4aefc8ea901a20f48d;hb=77d98d666a4ef24ef22f032476fd5d954c1a4699;hp=6351537fadf811ae84a26e92858e0173953ad0ce;hpb=35d2e7ec19f8d3960a14dc04642060ccee3faa43;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 6351537fa..b6041b5d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,7 +58,6 @@ rootbin_PROGRAMS = \ systemd-notify bin_PROGRAMS = \ - systemd-install \ systemd-cgls if HAVE_GTK @@ -77,7 +76,8 @@ noinst_PROGRAMS = \ test-ns \ test-loopback \ test-daemon \ - test-cgroup + test-cgroup \ + test-env-replace if HAVE_PAM pamlib_LTLIBRARIES = \ @@ -113,6 +113,7 @@ dbusinterface_DATA = \ dist_systemunit_DATA = \ units/emergency.service \ + units/emergency.target \ units/basic.target \ units/getty.target \ units/halt.target \ @@ -144,7 +145,10 @@ dist_systemunit_DATA = \ units/sys-kernel-security.automount \ units/sys-kernel-security.mount \ units/var-lock.mount \ - units/var-run.mount + units/var-run.mount \ + units/printer.target \ + units/bluetooth.target \ + units/smartcard.target nodist_systemunit_DATA = \ units/sysinit.target \ @@ -183,14 +187,18 @@ dist_systemunit_DATA += \ units/fedora/prefdm.service \ units/fedora/rc-local.service \ units/fedora/reboot.service \ - units/fedora/sysinit.service + units/fedora/sysinit.service \ + units/fedora/single.service \ + units/fedora/plymouth-quit.service \ + units/fedora/plymouth-shutdown.service endif if TARGET_SUSE dist_systemunit_DATA += \ units/suse/halt.service \ units/suse/poweroff.service \ - units/suse/reboot.service + units/suse/reboot.service \ + units/suse/fsck.target endif if TARGET_GENTOO @@ -292,7 +300,8 @@ libsystemd_core_la_LIBADD = \ $(DBUS_LIBS) \ $(UDEV_LIBS) \ $(LIBWRAP_LIBS) \ - $(PAM_LIBS) + $(PAM_LIBS) \ + $(SELINUX_LIBS) # This is needed because automake is buggy in how it generates the # rules for C programs, but not Vala programs. We therefore can't @@ -318,7 +327,6 @@ MANPAGES = \ man/systemd.1 \ man/systemctl.1 \ man/systemadm.1 \ - man/systemd-install.1 \ man/systemd-cgls.1 \ man/systemd-notify.1 \ man/sd_notify.3 \ @@ -441,6 +449,15 @@ test_cgroup_CFLAGS = \ test_cgroup_LDADD = \ libsystemd-basic.la +test_env_replace_SOURCES = \ + src/test-env-replace.c + +test_env_replace_CFLAGS = \ + $(AM_CFLAGS) + +test_env_replace_LDADD = \ + libsystemd-basic.la + systemd_logger_SOURCES = \ src/logger.c \ src/sd-daemon.c \ @@ -464,7 +481,8 @@ systemd_initctl_LDADD = \ $(DBUS_LIBS) systemd_cgroups_agent_SOURCES = \ - src/cgroups-agent.c + src/cgroups-agent.c \ + src/dbus-common.c systemd_cgroups_agent_CFLAGS = \ $(AM_CFLAGS) \ @@ -478,6 +496,8 @@ 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 @@ -496,22 +516,8 @@ systemd_notify_SOURCES = \ systemd_notify_LDADD = \ libsystemd-basic.la -systemd_install_SOURCES = \ - src/install.c \ - src/path-lookup.c \ - src/dbus-common.c \ - src/sd-daemon.c - -systemd_install_LDADD = \ - libsystemd-basic.la \ - $(DBUS_LIBS) - -systemd_install_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - systemd_cgls_SOURCES = \ - src/systemd-cgls.c \ + src/cgls.c \ src/cgroup-show.c \ src/cgroup-util.c @@ -707,11 +713,13 @@ install-data-hook: $(LN_S) ../systemd-logger.socket systemd-logger.socket && \ $(LN_S) ../systemd-initctl.socket systemd-initctl.socket ) ( cd $(DESTDIR)$(sessionunitdir) && \ - rm -f shutdown.target sockets.target local-fs.target swap.target && \ + rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \ $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \ $(LN_S) $(systemunitdir)/sockets.target sockets.target && \ $(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \ - $(LN_S) $(systemunitdir)/swap.target swap.target ) + $(LN_S) $(systemunitdir)/swap.target swap.target && \ + $(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \ + $(LN_S) $(systemunitdir)/printer.target printer.target) ( cd $(DESTDIR)$(systemunitdir) && \ rm -f runlevel0.target runlevel1.target runlevel6.target && \ $(LN_S) poweroff.target runlevel0.target && \ @@ -755,7 +763,9 @@ install-data-hook: $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) if TARGET_FEDORA $(MKDIR_P) -m 0755 \ - $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) + $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \ + $(DESTDIR)$(systemunitdir)/rescue.target.wants \ + $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants ( cd $(DESTDIR)$(pkgsysconfdir)/system && \ rm -f display-manager.service && \ $(LN_S) $(systemunitdir)/prefdm.service display-manager.service ) @@ -763,8 +773,15 @@ if TARGET_FEDORA rm -f prefdm.service && \ $(LN_S) $(systemunitdir)/prefdm.service prefdm.service ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \ - rm -f rc-local.service && \ - $(LN_S) $(systemunitdir)/rc-local.service rc-local.service ) + rm -f rc-local.service plymouth-quit.service && \ + $(LN_S) $(systemunitdir)/rc-local.service rc-local.service && \ + $(LN_S) $(systemunitdir)/plymouth-quit.service plymouth-quit.service ) + ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \ + rm -f single.service && \ + $(LN_S) $(systemunitdir)/single.service single.service ) + ( cd $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants && \ + rm -f plymouth-shutdown.service && \ + $(LN_S) $(systemunitdir)/plymouth-shutdown.service plymouth-shutdown.service ) ( cd $(DESTDIR)$(systemunitdir) && \ rm -f local.service && \ $(LN_S) rc-local.service local.service ) @@ -779,6 +796,11 @@ if TARGET_GENTOO rm -f xdm.service && \ $(LN_S) $(systemunitdir)/xdm.service xdm.service ) endif +if !TARGET_SUSE + ( cd $(DESTDIR)$(systemunitdir) && \ + rm -f fsck.target && \ + $(LN_S) sysinit.target fsck.target ) +endif DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \