X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d8757868e85b7bc90d10d39a6c30a73115bb062d;hp=56047c39719256a945173d9e2e0df15046569bac;hb=d3782d60cd47f57f48a9229bdd3badbd2f4bae44;hpb=d122948d6fbaac4505cf14a08f1237daa89efdd0

diff --git a/Makefile.am b/Makefile.am
index 56047c397..d8757868e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,8 +50,11 @@ rootbin_PROGRAMS = \
 	systemd \
 	systemctl
 
-if HAVE_GTK
 bin_PROGRAMS = \
+	systemd-install
+
+if HAVE_GTK
+bin_PROGRAMS += \
 	systemadm
 endif
 
@@ -199,6 +202,7 @@ COMMON_SOURCES = \
 	src/unit.c \
         src/job.c \
         src/manager.c \
+	src/path-lookup.c \
         src/load-fragment.c \
         src/service.c \
         src/automount.c \
@@ -274,8 +278,8 @@ systemd_SOURCES = \
 	$(COMMON_SOURCES) \
 	src/main.c
 
-systemd_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+systemd_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(UDEV_CFLAGS) \
 	$(CGROUP_CFLAGS)
@@ -289,14 +293,14 @@ test_engine_SOURCES = \
 	$(COMMON_SOURCES) \
 	src/test-engine.c
 
-test_engine_CPPFLAGS = $(systemd_CPPFLAGS)
+test_engine_CFLAGS = $(systemd_CFLAGS)
 test_engine_LDADD = $(systemd_LDADD)
 
 test_job_type_SOURCES = \
 	$(COMMON_SOURCES) \
 	src/test-job-type.c
 
-test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
+test_job_type_CFLAGS = $(systemd_CFLAGS)
 test_job_type_LDADD = $(systemd_LDADD)
 
 test_ns_SOURCES = \
@@ -304,7 +308,7 @@ test_ns_SOURCES = \
 	src/test-ns.c \
 	src/namespace.c
 
-test_ns_CPPFLAGS = $(systemd_CPPFLAGS)
+test_ns_CFLAGS = $(systemd_CFLAGS)
 test_ns_LDADD = $(systemd_LDADD)
 
 test_loopback_SOURCES = \
@@ -312,7 +316,7 @@ test_loopback_SOURCES = \
 	src/test-loopback.c \
 	src/loopback-setup.c
 
-test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
+test_loopback_CFLAGS = $(systemd_CFLAGS)
 test_loopback_LDADD = $(systemd_LDADD)
 
 systemd_logger_SOURCES = \
@@ -325,8 +329,8 @@ systemd_initctl_SOURCES = \
 	src/initctl.c \
 	src/sd-daemon.c
 
-systemd_initctl_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+systemd_initctl_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 systemd_initctl_LDADD = \
@@ -336,40 +340,47 @@ systemd_cgroups_agent_SOURCES = \
 	$(BASIC_SOURCES) \
 	src/cgroups-agent.c
 
-systemd_cgroups_agent_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+systemd_cgroups_agent_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 systemd_cgroups_agent_LDADD = \
 	$(DBUS_LIBS)
 
-VALAFLAGS = \
-	-g \
-	--save-temps \
-	--pkg=dbus-glib-1 \
-	--pkg=posix
+systemctl_SOURCES = \
+	src/systemctl.c \
+	$(BASIC_SOURCES)
 
-if HAVE_GTK
-VALAFLAGS += \
-	--pkg=gtk+-2.0
-endif
+systemctl_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+systemctl_LDADD = $(DBUS_LIBS)
 
-VALA_CFLAGS = \
-	-Wno-unused-variable \
-	-Wno-unused-function
+systemd_install_SOURCES = \
+	src/install.c \
+	src/path-lookup.c \
+	$(BASIC_SOURCES)
 
-systemctl_SOURCES = \
-	src/systemctl.vala \
-	src/systemd-interfaces.vala
-
-systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
-systemctl_LDADD = $(DBUSGLIB_LIBS)
+# We don't really link here against D-Bus, however we indirectly include D-Bus header files
+systemd_install_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
 systemadm_SOURCES = \
 	src/systemadm.vala \
 	src/systemd-interfaces.vala
 
-systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
+systemadm_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUSGLIB_CFLAGS) \
+	$(GTK_CFLAGS) \
+	-Wno-unused-variable \
+	-Wno-unused-function \
+	-Wno-shadow \
+	-Wno-format-nonliteral
+
+systemadm_VALAFLAGS = \
+	--pkg=dbus-glib-1 \
+	--pkg=posix \
+	--pkg=gtk+-2.0 \
+	-g
+
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 SED_PROCESS = \
@@ -417,7 +428,6 @@ CLEANFILES = \
 if HAVE_VALAC
 CLEANFILES += \
 	src/systemd-interfaces.c \
-	src/systemctl.c \
 	src/systemadm.c
 endif
 
@@ -565,5 +575,9 @@ if TARGET_GENTOO
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
+	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
+	--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
+	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
+	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
 	--with-rootdir=$$dc_install_base/$(rootdir)