units: fix logger/initctl paths

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 361786983d9e49ab90a1233b941804af31169697..d08644a6f95ec3941cd5121df753fa097c656809 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,11 @@ AM_CPPFLAGS = \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
        -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
        -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-       -DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\"
+       -DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
+       -DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
+
+#      -DSYSTEMD_BINARY_PATH=\"/home/lennart/projects/systemd/systemd\"
+
 
 sbin_PROGRAMS = \
        systemd
@@ -48,7 +52,8 @@ pkglibexec_PROGRAMS = \
 
 noinst_PROGRAMS = \
        test-engine \
-       test-job-type
+       test-job-type \
+       test-ns
 
 dbuspolicy_DATA = \
        org.freedesktop.systemd1.conf
@@ -128,6 +133,22 @@ COMMON_SOURCES= \
         dbus-unit.h \
         dbus-job.c \
         dbus-job.h \
+       dbus-service.c \
+       dbus-service.h \
+       dbus-socket.c \
+       dbus-socket.h \
+       dbus-target.c \
+       dbus-target.h \
+       dbus-mount.c \
+       dbus-mount.h \
+       dbus-automount.c \
+       dbus-autpmount.h \
+       dbus-snapshot.c \
+       dbus-snapshot.h \
+       dbus-device.c \
+       dbus-device.h \
+       dbus-execute.c \
+       dbus-execute.h \
        cgroup.c \
        cgroup.h \
        mount-setup.c \
@@ -135,7 +156,15 @@ COMMON_SOURCES= \
        hostname-setup.c \
        hostname-setup.h \
        utmp-wtmp.c \
-       utmp-wtmp.h
+       utmp-wtmp.h \
+       specifier.c \
+       specifier.h \
+       unit-name.c \
+       unit-name.h \
+       fdset.c \
+       fdset.h \
+       namespace.h \
+       namespace.c
 
 systemd_SOURCES = \
        $(COMMON_SOURCES) \
@@ -166,6 +195,14 @@ test_job_type_SOURCES = \
 test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
 test_job_type_LDADD = $(systemd_LDADD)
 
+test_ns_SOURCES = \
+       $(BASIC_SOURCES) \
+       test-ns.c \
+       namespace.c
+
+test_ns_CPPFLAGS = $(systemd_CPPFLAGS)
+test_ns_LDADD = $(systemd_LDADD)
+
 systemd_logger_SOURCES = \
        $(BASIC_SOURCES) \
        logger.c
@@ -209,10 +246,14 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 systemd-initctl.service: units/systemd-initctl.service.in Makefile
-       sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+       sed -e 's,@libexecdir\@,$(libexecdir),g' \
+               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+               < $< > $@
 
 systemd-logger.service: units/systemd-logger.service.in Makefile
-       sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+       sed -e 's,@libexecdir\@,$(libexecdir),g' \
+               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+               < $< > $@
 
 CLEANFILES = \
        systemd-interfaces.c \