configure: Allow to disable build of tools that require GTK.

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c98ad0b8b956d89a70fdab6e3a21d5e59c8aad2e..ebcdedd4fc5f061f5c28525b7e234fb38c057248 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,8 +42,12 @@ sbin_PROGRAMS = \
        systemd
 
 bin_PROGRAMS = \
-       systemctl \
+       systemctl
+
+if HAVE_GTK
+bin_PROGRAMS += \
        systemadm
+endif
 
 pkglibexec_PROGRAMS = \
        systemd-logger \
@@ -53,7 +57,8 @@ pkglibexec_PROGRAMS = \
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
-       test-ns
+       test-ns \
+       test-loopback
 
 dbuspolicy_DATA = \
        org.freedesktop.systemd1.conf
@@ -77,95 +82,69 @@ EXTRA_DIST = \
        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 \
-        util.h \
         hashmap.c \
-        hashmap.h \
         set.c \
-        set.h \
         strv.c \
-        strv.h \
         conf-parser.c \
-        conf-parser.h \
         socket-util.c \
-        socket-util.h \
         log.c \
-        log.h \
-        ratelimit.c \
-        ratelimit.h
+        ratelimit.c
 
 COMMON_SOURCES = \
        $(BASIC_SOURCES) \
        unit.c \
-       unit.h \
         job.c \
-       job.h \
         manager.c \
-        manager.h \
         load-fragment.c \
-        load-fragment.h \
         service.c \
-        service.h \
         automount.c \
-        automount.h \
         mount.c \
-        mount.h \
+        swap.c \
         device.c \
-        device.h \
         target.c \
-        target.h \
         snapshot.c \
-        snapshot.h \
         socket.c \
-        socket.h \
         timer.c \
-        timer.h \
         load-dropin.c \
-        load-dropin.h \
         execute.c \
-        execute.h \
         dbus.c \
-        dbus.h \
         dbus-manager.c \
-        dbus-manager.h \
         dbus-unit.c \
-        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-swap.c \
        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 \
-       mount-setup.h \
        hostname-setup.c \
-       hostname-setup.h \
+       loopback-setup.c \
        utmp-wtmp.c \
-       utmp-wtmp.h \
        specifier.c \
-       specifier.h \
        unit-name.c \
-       unit-name.h \
        fdset.c \
-       fdset.h \
-       namespace.h \
        namespace.c
 
+EXTRA_DIST += \
+       ${COMMON_SOURCES:.c=.h} \
+       macro.h \
+       ioprio.h \
+       missing.h \
+       list.h \
+       securebits.h \
+       linux/auto_dev-ioctl.h \
+       initreq.h
+
 systemd_SOURCES = \
        $(COMMON_SOURCES) \
        main.c
@@ -203,6 +182,14 @@ test_ns_SOURCES = \
 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