chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
unit: move prefdm after livesys
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index ff8e847bbefe7562e4f95aab9cbf4872799d4fd5..3d33e7932599c476cd8a504b8741bd651e968ec1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,6 @@ rootbin_PROGRAMS = \
        systemd-notify
 
 bin_PROGRAMS = \
-       systemd-install \
        systemd-cgls
 
 if HAVE_GTK
@@ -69,7 +68,8 @@ endif
 rootlibexec_PROGRAMS = \
        systemd-logger \
        systemd-cgroups-agent \
-       systemd-initctl
+       systemd-initctl \
+       systemd-update-utmp
 
 noinst_PROGRAMS = \
        test-engine \
@@ -77,7 +77,8 @@ noinst_PROGRAMS = \
        test-ns \
        test-loopback \
        test-daemon \
-       test-cgroup
+       test-cgroup \
+       test-env-replace
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -147,7 +148,8 @@ dist_systemunit_DATA = \
        units/var-lock.mount \
        units/var-run.mount \
        units/printer.target \
-       units/bluetooth.target
+       units/bluetooth.target \
+       units/smartcard.target
 
 nodist_systemunit_DATA = \
        units/sysinit.target \
@@ -157,6 +159,8 @@ nodist_systemunit_DATA = \
        units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
+       units/systemd-update-utmp-runlevel.service \
+       units/systemd-update-utmp-shutdown.service \
        units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -174,6 +178,8 @@ EXTRA_DIST = \
        units/remote-fs.target.m4 \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
+       units/systemd-update-utmp-runlevel.service.in \
+       units/systemd-update-utmp-shutdown.service.in \
        units/syslog.target.in \
        units/session/exit.service.in \
        systemd.pc.in
@@ -187,14 +193,17 @@ dist_systemunit_DATA += \
        units/fedora/rc-local.service \
        units/fedora/reboot.service \
        units/fedora/sysinit.service \
-       units/fedora/single.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
@@ -231,6 +240,7 @@ noinst_LTLIBRARIES = \
 
 libsystemd_basic_la_SOURCES = \
         src/util.c \
+       src/label.c \
         src/hashmap.c \
         src/set.c \
         src/strv.c \
@@ -239,6 +249,13 @@ libsystemd_basic_la_SOURCES = \
         src/log.c \
         src/ratelimit.c
 
+libsystemd_basic_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SELINUX_CFLAGS)
+
+libsystemd_basic_la_LIBADD = \
+       $(SELINUX_LIBS)
+
 libsystemd_core_la_SOURCES = \
        src/unit.c \
         src/job.c \
@@ -278,7 +295,6 @@ libsystemd_core_la_SOURCES = \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/modprobe-setup.c \
-       src/utmp-wtmp.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
@@ -289,14 +305,18 @@ libsystemd_core_la_SOURCES = \
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS)
+       $(UDEV_CFLAGS) \
+       $(LIBWRAP_CFLAGS) \
+       $(PAM_CFLAGS) \
+       $(AUDIT_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS) \
        $(UDEV_LIBS) \
        $(LIBWRAP_LIBS) \
-       $(PAM_LIBS)
+       $(PAM_LIBS) \
+       $(AUDIT_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
@@ -316,13 +336,14 @@ EXTRA_DIST += \
        src/special.h \
        src/dbus-common.h \
        src/bus-errors.h \
-       src/cgroup-show.h
+       src/cgroup-show.h \
+       src/utmp-wtmp.h \
+       src/build.h
 
 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 \
@@ -445,6 +466,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 \
@@ -467,8 +497,24 @@ systemd_initctl_LDADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS)
 
+systemd_update_utmp_SOURCES = \
+       src/update-utmp.c \
+       src/dbus-common.c \
+       src/utmp-wtmp.c
+
+systemd_update_utmp_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(AUDIT_CFLAGS)
+
+systemd_update_utmp_LDADD = \
+       libsystemd-basic.la \
+       $(DBUS_LIBS) \
+       $(AUDIT_LIBS)
+
 systemd_cgroups_agent_SOURCES = \
-       src/cgroups-agent.c
+       src/cgroups-agent.c \
+       src/dbus-common.c
 
 systemd_cgroups_agent_CFLAGS = \
        $(AM_CFLAGS) \
@@ -482,6 +528,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
 
@@ -500,22 +548,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
 
@@ -695,6 +729,12 @@ install-data-hook:
                $(DESTDIR)$(sessionunitdir) \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
                $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
+               $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+               $(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
+               $(DESTDIR)$(systemunitdir)/runlevel2.target.wants \
+               $(DESTDIR)$(systemunitdir)/runlevel3.target.wants \
+               $(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
+               $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
                $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
@@ -710,6 +750,24 @@ install-data-hook:
                rm -f systemd-initctl.socket systemd-logger.socket && \
                $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
+       ( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
+               rm -f systemd-update-utmp-runlevel.service && \
+               $(LN_S) ../systemd-update-utmp-runlevel.service )
+       ( cd $(DESTDIR)$(systemunitdir)/runlevel2.target.wants && \
+               rm -f systemd-update-utmp-runlevel.service && \
+               $(LN_S) ../systemd-update-utmp-runlevel.service )
+       ( cd $(DESTDIR)$(systemunitdir)/runlevel3.target.wants && \
+               rm -f systemd-update-utmp-runlevel.service && \
+               $(LN_S) ../systemd-update-utmp-runlevel.service )
+       ( cd $(DESTDIR)$(systemunitdir)/runlevel4.target.wants && \
+               rm -f systemd-update-utmp-runlevel.service && \
+               $(LN_S) ../systemd-update-utmp-runlevel.service )
+       ( cd $(DESTDIR)$(systemunitdir)/runlevel5.target.wants && \
+               rm -f systemd-update-utmp-runlevel.service && \
+               $(LN_S) ../systemd-update-utmp-runlevel.service )
+       ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
+               rm -f systemd-update-utmp-shutdown.service && \
+               $(LN_S) ../systemd-update-utmp-shutdown.service )
        ( cd $(DESTDIR)$(sessionunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -762,6 +820,7 @@ install-data-hook:
 if TARGET_FEDORA
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
+               $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants \
                $(DESTDIR)$(systemunitdir)/rescue.target.wants
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
                rm -f display-manager.service && \
@@ -770,11 +829,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 )
@@ -789,6 +852,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) \
Unnamed repository; edit this file 'description' to name the repository.