systemctl: support force-reload and condrestart as aliases for reload-or-try-restart

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 51fe5a946139c47d7e6461f131de357c0339fdb6..0c3262e02ee5bd491f72b952a8a6d5cd6a067690 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,8 @@ noinst_PROGRAMS = \
        test-ns \
        test-loopback \
        test-daemon \
-       test-cgroup
+       test-cgroup \
+       test-env-replace
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -145,7 +146,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 \
@@ -294,7 +298,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
@@ -443,6 +448,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 \
@@ -513,7 +527,7 @@ systemd_install_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_cgls_SOURCES = \
-       src/systemd-cgls.c \
+       src/cgls.c \
        src/cgroup-show.c \
        src/cgroup-util.c
 
@@ -709,11 +723,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 && \