build-sys: move remaining tools from sbin/ to bin/ since they might eventually be...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f867624f1aed1f98ea6f4bb8b5870b2cc5cae635..a2e40c3fd1748eab52f3ba1c143b6a0111e025c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,6 +58,7 @@ AM_CPPFLAGS = \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
+        -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
        -DRUNTIME_DIR=\"$(localstatedir)/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
@@ -105,13 +106,13 @@ rootbin_PROGRAMS = \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
-       systemd-tmpfiles
-
-rootsbin_PROGRAMS = \
+       systemd-tmpfiles \
        systemd-machine-id-setup
 
 bin_PROGRAMS = \
-       systemd-cgls
+       systemd-cgls \
+       systemd-stdio-bridge \
+        systemd-nspawn
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -337,7 +338,8 @@ EXTRA_DIST = \
        units/fsck-root.service.in \
        units/quotacheck.service.in \
        systemd.pc.in \
-       introspect.awk
+       introspect.awk \
+       src/org.freedesktop.systemd1.policy.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -384,7 +386,7 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
-dist_polkitpolicy_DATA = \
+polkitpolicy_DATA = \
        src/org.freedesktop.systemd1.policy
 
 noinst_LTLIBRARIES = \
@@ -980,6 +982,21 @@ systemd_cgls_CFLAGS = \
 systemd_cgls_LDADD = \
        libsystemd-basic.la
 
+systemd_nspawn_SOURCES = \
+       src/nspawn.c
+
+systemd_nspawn_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_nspawn_LDADD = \
+       libsystemd-basic.la
+
+systemd_stdio_bridge_SOURCES = \
+       src/bridge.c
+
+systemd_stdio_bridge_LDADD = \
+       libsystemd-basic.la
+
 systemadm_SOURCES = \
        src/systemadm.vala \
        src/systemd-interfaces.vala
@@ -1061,6 +1078,7 @@ SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
                 -e 's,@rootbindir\@,$(rootbindir),g' \
+                -e 's,@bindir\@,$(bindir),g' \
                -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
@@ -1082,6 +1100,9 @@ man/%: man/%.in Makefile
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
+src/%.policy: src/%.policy.in Makefile
+       $(SED_PROCESS)
+
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
@@ -1101,7 +1122,8 @@ CLEANFILES = \
        $(nodist_userunit_DATA) \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
-       $(pkgconfigdata_DATA)
+       $(pkgconfigdata_DATA) \
+       src/org.freedesktop.systemd1.policy
 
 if HAVE_VALAC
 CLEANFILES += \