vala: hide a few vala warnings

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c38c7d575c751f447aea9fb455267d42691457d6..e86eedf3a534665a7047d04c8f68d34d6d843cdc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,14 +36,18 @@ AM_CPPFLAGS = \
        -DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
 
 #      -DSYSTEMD_BINARY_PATH=\"/home/lennart/projects/systemd/systemd\"
-
+VALA_CFLAGS=-Wno-unused-variable -Wno-unused-function
 
 sbin_PROGRAMS = \
        systemd
 
 bin_PROGRAMS = \
-       systemctl \
+       systemctl
+
+if HAVE_GTK
+bin_PROGRAMS += \
        systemadm
+endif
 
 pkglibexec_PROGRAMS = \
        systemd-logger \
@@ -78,97 +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 \
-       loopback-setup.h \
        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
@@ -246,14 +222,14 @@ systemctl_SOURCES = \
        systemctl.vala \
        systemd-interfaces.vala
 
-systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS)
+systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
 systemctl_LDADD = $(DBUSGLIB_LIBS)
 
 systemadm_SOURCES = \
        systemadm.vala \
        systemd-interfaces.vala
 
-systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
+systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 systemd-initctl.service: units/systemd-initctl.service.in Makefile