Remove .h files from _SOURCES

[people/ms/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8b481a6be940bed0c49fa2dcdce5ae4321d2f681..7396dddd87e30ead9680f1e85dfc97bf2a5cdf49 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,23 +17,71 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+pkgsysconfdir=$(sysconfdir)/systemd
+dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+udevrulesdir=/lib/udev/rules.d
+
+systemunitdir=$(pkgdatadir)/system
+sessionunitdir=$(pkgdatadir)/system
+
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
-       -DUNIT_PATH=\"/tmp/does/not/exist\"
+       -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
+       -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
+       -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
+       -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
+       -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
+       -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
+       -DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
+       -DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
+
+#      -DSYSTEMD_BINARY_PATH=\"/home/lennart/projects/systemd/systemd\"
+
 
 sbin_PROGRAMS = \
        systemd
 
 bin_PROGRAMS = \
        systemctl \
-       systemadm \
-       systemd-logger
+       systemadm
+
+pkglibexec_PROGRAMS = \
+       systemd-logger \
+       systemd-cgroups-agent \
+       systemd-initctl
 
 noinst_PROGRAMS = \
        test-engine \
-       test-job-type
-
-BASIC_SOURCES= \
+       test-job-type \
+       test-ns \
+       test-loopback
+
+dbuspolicy_DATA = \
+       org.freedesktop.systemd1.conf
+
+udevrules_DATA = \
+       99-systemd.rules
+
+systemunit_DATA = \
+       units/emergency.service \
+       systemd-initctl.service \
+       units/systemd-initctl.socket \
+       systemd-logger.service \
+       units/systemd-logger.socket
+
+EXTRA_DIST = \
+       org.freedesktop.systemd1.conf \
+       99-systemd.rules \
+       units/emergency.service \
+       units/systemd-initctl.service.in \
+       units/systemd-initctl.socket \
+       units/systemd-logger.service.in \
+       units/systemd-logger.socket
+
+# This is needed because automake is buggy in how it generates the
+# rules for C programs, but not Vala programs.  We therefore can't
+# list the .h files as dependencies if we want make dist to work.
+BASIC_SOURCES = \
         util.c \
         hashmap.c \
         set.c \
@@ -43,7 +91,7 @@ BASIC_SOURCES= \
         log.c \
         ratelimit.c
 
-COMMON_SOURCES= \
+COMMON_SOURCES = \
        $(BASIC_SOURCES) \
        unit.c \
         job.c \
@@ -52,6 +100,7 @@ COMMON_SOURCES= \
         service.c \
         automount.c \
         mount.c \
+        swap.c \
         device.c \
         target.c \
         snapshot.c \
@@ -62,7 +111,25 @@ COMMON_SOURCES= \
         dbus.c \
         dbus-manager.c \
         dbus-unit.c \
-        dbus-job.c
+        dbus-job.c \
+       dbus-service.c \
+       dbus-socket.c \
+       dbus-target.c \
+       dbus-mount.c \
+       dbus-automount.c \
+       dbus-swap.c \
+       dbus-snapshot.c \
+       dbus-device.c \
+       dbus-execute.c \
+       cgroup.c \
+       mount-setup.c \
+       hostname-setup.c \
+       loopback-setup.c \
+       utmp-wtmp.c \
+       specifier.c \
+       unit-name.c \
+       fdset.c \
+       namespace.c
 
 systemd_SOURCES = \
        $(COMMON_SOURCES) \
@@ -71,11 +138,13 @@ systemd_SOURCES = \
 systemd_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS)
+       $(UDEV_CFLAGS) \
+       $(CGROUP_CFLAGS)
 
 systemd_LDADD = \
        $(DBUS_LIBS) \
-       $(UDEV_LIBS)
+       $(UDEV_LIBS) \
+       $(CGROUP_LIBS)
 
 test_engine_SOURCES = \
        $(COMMON_SOURCES) \
@@ -91,11 +160,49 @@ 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)
+
+test_loopback_SOURCES = \
+       $(BASIC_SOURCES) \
+       test-loopback.c \
+       loopback-setup.c
+
+test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
+test_loopback_LDADD = $(systemd_LDADD)
+
 systemd_logger_SOURCES = \
        $(BASIC_SOURCES) \
        logger.c
 
-VALAFLAGS = -g --save-temps --pkg=dbus-glib-1 --pkg=posix --pkg gee-1.0 --pkg gtk+-2.0
+systemd_initctl_SOURCES = \
+       $(BASIC_SOURCES) \
+       initctl.c
+
+systemd_initctl_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_initctl_LDADD = \
+       $(DBUS_LIBS)
+
+systemd_cgroups_agent_SOURCES = \
+       $(BASIC_SOURCES) \
+       cgroups-agent.c
+
+systemd_cgroups_agent_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_cgroups_agent_LDADD = \
+       $(DBUS_LIBS)
+
+VALAFLAGS = -g --save-temps --pkg=dbus-glib-1 --pkg=posix --pkg gtk+-2.0
 
 systemctl_SOURCES = \
        systemctl.vala \
@@ -111,7 +218,19 @@ systemadm_SOURCES = \
 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' \
+               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+               < $< > $@
+
+systemd-logger.service: units/systemd-logger.service.in Makefile
+       sed -e 's,@libexecdir\@,$(libexecdir),g' \
+               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+               < $< > $@
+
 CLEANFILES = \
        systemd-interfaces.c \
        systemctl.c \
-       systemadm.c
+       systemadm.c \
+       systemd-initctl.service \
+       systemd-logger.service