main: introduce $SYSTEMD_SKIP_API_MOUNTS to disable mounting of API FS

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cdb5be314e969f8065f48d4fd3ca6d3a568523d1..52339718a1d0fcd3ba0ddd11b9352963797cc63e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,8 @@ rootbin_PROGRAMS = \
        systemd-notify
 
 bin_PROGRAMS = \
-       systemd-install
+       systemd-install \
+       systemd-cgls
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -311,13 +312,16 @@ EXTRA_DIST += \
        src/initreq.h \
        src/sd-daemon.h \
        src/special.h \
-       src/dbus-common.h
+       src/dbus-common.h \
+       src/bus-errors.h \
+       src/cgroup-show.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 \
        man/sd_booted.3 \
@@ -341,7 +345,8 @@ MANPAGES = \
        man/telinit.8 \
        man/halt.8 \
        man/shutdown.8 \
-       man/pam_systemd.8
+       man/pam_systemd.8 \
+       man/systemd.conf.5
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -452,7 +457,8 @@ systemd_logger_LDADD = \
 
 systemd_initctl_SOURCES = \
        src/initctl.c \
-       src/sd-daemon.c
+       src/sd-daemon.c \
+       src/dbus-common.c
 
 systemd_initctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -476,7 +482,8 @@ systemd_cgroups_agent_LDADD = \
 systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
-       src/dbus-common.c
+       src/dbus-common.c \
+       src/cgroup-show.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -496,7 +503,8 @@ systemd_notify_LDADD = \
 systemd_install_SOURCES = \
        src/install.c \
        src/path-lookup.c \
-       src/dbus-common.c
+       src/dbus-common.c \
+       src/sd-daemon.c
 
 systemd_install_LDADD = \
        libsystemd-basic.la \
@@ -506,6 +514,16 @@ systemd_install_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
+systemd_cgls_SOURCES = \
+       src/systemd-cgls.c \
+       src/cgroup-show.c
+
+systemd_cgls_LDADD = \
+       libsystemd-basic.la
+
+systemd_cgls_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemadm_SOURCES = \
        src/systemadm.vala \
        src/systemd-interfaces.vala
@@ -749,7 +767,7 @@ if TARGET_FEDORA
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
                rm -f prefdm.service && \
-               $(LN_S) ../prefdm.service 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 )
@@ -764,8 +782,8 @@ if TARGET_GENTOO
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/xdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f prefdm.service && \
-               $(LN_S) ../prefdm.service prefdm.service )
+               rm -f xdm.service && \
+               $(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \