X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=26a2c95850387bb7157d116159c5dc7e81860737;hb=4697132b91989da27b11af179c430305bb9db9ac;hp=f475e9849c8c1e9c9470fd2519e34696095d8fec;hpb=462b33e96ad1732658b39895eea0b146e98bc3a5;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index f475e9849..26a2c9585 100644
--- 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 \
@@ -76,7 +80,9 @@ EXTRA_DIST = \
 	units/systemd-initctl.service.in \
 	units/systemd-initctl.socket \
 	units/systemd-logger.service.in \
-	units/systemd-logger.socket
+	units/systemd-logger.socket \
+	LICENSE \
+	README
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't
@@ -218,14 +224,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
@@ -244,3 +250,8 @@ CLEANFILES = \
 	systemadm.c \
 	systemd-initctl.service \
 	systemd-logger.service
+
+install-data-hook:
+	$(MKDIR_P) $(DESTDIR)$(pkgsysconfdir)/system $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd
+	rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session
+	ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session