X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=b887d2621c4dc197c8e4d30cf94088c25a05911e;hb=812cce323db081634f37e4ec6d29f2b9328a3f52;hp=20fd06f8267cf827c2d36923d56c3dfe296a8c62;hpb=84e3543ef4c4758621f8a304b14642072303ef82;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 20fd06f82..b887d2621 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
 
@@ -64,7 +67,8 @@ noinst_PROGRAMS = \
 	test-engine \
 	test-job-type \
 	test-ns \
-	test-loopback
+	test-loopback \
+	test-daemon
 
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.conf
@@ -237,7 +241,8 @@ COMMON_SOURCES = \
 	src/specifier.c \
 	src/unit-name.c \
 	src/fdset.c \
-	src/namespace.c
+	src/namespace.c \
+	src/tcpwrap.c
 
 EXTRA_DIST += \
 	${COMMON_SOURCES:.c=.h} \
@@ -275,8 +280,8 @@ systemd_SOURCES = \
 	$(COMMON_SOURCES) \
 	src/main.c
 
-systemd_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+systemd_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(UDEV_CFLAGS) \
 	$(CGROUP_CFLAGS)
@@ -284,20 +289,22 @@ systemd_CPPFLAGS = \
 systemd_LDADD = \
 	$(DBUS_LIBS) \
 	$(UDEV_LIBS) \
-	$(CGROUP_LIBS)
+	$(CGROUP_LIBS) \
+	$(LIBWRAP_LIBS) \
+	$(PAM_LIBS)
 
 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 = \
@@ -305,7 +312,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 = \
@@ -313,21 +320,27 @@ test_loopback_SOURCES = \
 	src/test-loopback.c \
 	src/loopback-setup.c
 
-test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
-test_loopback_LDADD = $(systemd_LDADD)
+test_daemon_SOURCES = \
+	$(BASIC_SOURCES) \
+	src/test-daemon.c \
+	src/sd-daemon.c
 
 systemd_logger_SOURCES = \
 	$(BASIC_SOURCES) \
 	src/logger.c \
-	src/sd-daemon.c
+	src/sd-daemon.c \
+	src/tcpwrap.c
+
+systemd_logger_LDADD = \
+	$(LIBWRAP_LIBS)
 
 systemd_initctl_SOURCES = \
 	$(BASIC_SOURCES) \
 	src/initctl.c \
 	src/sd-daemon.c
 
-systemd_initctl_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
+systemd_initctl_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 systemd_initctl_LDADD = \
@@ -337,8 +350,8 @@ 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 = \
@@ -348,29 +361,36 @@ systemctl_SOURCES = \
 	src/systemctl.c \
 	$(BASIC_SOURCES)
 
-systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS)
+systemctl_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 systemctl_LDADD = $(DBUS_LIBS)
 
-VALAFLAGS = \
-	-g \
-	--save-temps \
-	--pkg=dbus-glib-1 \
-	--pkg=posix
-
-if HAVE_GTK
-VALAFLAGS += \
-	--pkg=gtk+-2.0
-endif
+systemd_install_SOURCES = \
+	src/install.c \
+	src/path-lookup.c \
+	$(BASIC_SOURCES)
 
-VALA_CFLAGS = \
-	-Wno-unused-variable \
-	-Wno-unused-function
+# 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 = \