[folks] Use automake's Vala support to build libfolks.



commit be540eddb76303ba568dafa1ccc3660ebd5ecba9
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Mon Oct 18 13:23:57 2010 -0700

    Use automake's Vala support to build libfolks.

 folks/Makefile.am |   50 +++++++++++++++++---------------------------------
 1 files changed, 17 insertions(+), 33 deletions(-)
---
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 1d9bf73..a83dbfa 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
 lib_LTLIBRARIES = libfolks.la
 
 # Vala files to compile into libfolks.la
-folks_valasources = \
+libfolks_la_SOURCES = \
 	aliasable.vala \
 	avatar.vala \
 	backend.vala \
@@ -28,15 +28,15 @@ folks_valasources = \
 	debug.vala \
 	$(NULL)
 
-libfolks_la_SOURCES = $(folks_valasources:.vala=.c)
-
-# Build-time dependencies for libfolks
-folks_deps = \
-	build-conf \
-	gobject-2.0 \
-	gmodule-2.0 \
-	gio-2.0 \
-	gee-1.0 \
+libfolks_la_VALAFLAGS = \
+	--vapidir=. \
+	--pkg build-conf \
+	--pkg gobject-2.0 \
+	--pkg gmodule-2.0 \
+	--pkg gio-2.0 \
+	--pkg gee-1.0 \
+	--vapi folks.vapi \
+	-H folks.h \
 	$(NULL)
 
 libfolks_la_CFLAGS = \
@@ -62,14 +62,6 @@ libfolks_la_LDFLAGS = \
 folksdir = $(includedir)/folks
 folks_HEADERS = folks.h
 
-folks.h $(libfolks_la_SOURCES): folks.vala.stamp
-
-folks.vapi folks.vala.stamp: $(folks_valasources)
-	$(VALA_V)$(VALAC) $(VALAFLAGS) -C -H folks.h \
-		--library folks --vapidir=. $(addprefix --pkg ,$(folks_deps)) \
-		$(folks_valasources)
-	touch $@
-
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = \
 	folks.vapi \
@@ -81,31 +73,23 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in:.in=)
 
 EXTRA_DIST = \
-	$(folks_valasources) \
 	$(pkgconfig_in) \
 	build-conf.vapi \
-	folks.vala.stamp \
-	folks.vapi \
 	$(NULL)
 
 CLEANFILES = \
-	folks.h \
-	$(libfolks_la_SOURCES) \
-	folks.vapi \
-	folks.vala.stamp \
 	$(pkgconfig_DATA) \
 	folks-uninstalled.pc \
 	$(NULL)
 
-MAINTAINERCLEANFILES = \
-	$(libfolks_la_SOURCES) \
+BUILT_SOURCES = \
+	folks.h \
+	folks.vapi \
 	$(NULL)
 
-# set up the verbosity rules to avoid some build noise
-# XXX: once automake >= 1.11 is common, remove these, push folks_valasources
-# files into SOURCES and add AM_PROG_VALAC to configure.ac
-VALA_V = $(VALA_V_$(V))
-VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
-VALA_V_0 = @echo "  VALAC " $^;
+GITIGNOREFILES = \
+	$(libfolks_la_SOURCES:.vala=.c) \
+	libfolks_la_vala.stamp \
+	$(NULL)
 
 -include $(top_srcdir)/git.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]