cpw.qulogic.vala: c1917118: Fix build dependency problems. Add some ...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: c19171181c1cc64ca2dd2f4383002f8266d34102
Parent:   0849b9ff0b4812886df2da8348392205859b7c24
Author:   qulogic at pidgin.im
Date:     12/20/10 19:43:13
Branch:   im.pidgin.cpw.qulogic.vala
URL: http://d.pidgin.im/viewmtn/revision/info/c19171181c1cc64ca2dd2f4383002f8266d34102

Changelog: 

Fix build dependency problems. Add some target-specfic flags and
dependencies. Fix the *.deps.in files.

Changes against parent 0849b9ff0b4812886df2da8348392205859b7c24

  patched  vapi/Makefile.am

-------------- next part --------------
============================================================
--- vapi/Makefile.am	615d4f6bddd3ef3a3839ec064de94122c5a9fa39
+++ vapi/Makefile.am	e574e1481d4957f3f83af8cbb807f49f70822c4d
@@ -2,16 +2,20 @@ targets=purple
 vapidir=$(datadir)/vala/vapi
 
 targets=purple
-INCLUDES=-I at top_srcdir@/libpurple $(GLIB_CFLAGS)
+purple_VALAFLAGS=-I at top_srcdir@/libpurple $(GLIB_CFLAGS)
 
 if ENABLE_GTK
 targets+=pidgin
-INCLUDES+= -I at top_srcdir@/pidgin $(GTK_CFLAGS)
+pidgin_VALAFLAGS=$(purple_VALAFLAGS) -I at top_srcdir@/pidgin $(GTK_CFLAGS)
+pidgin_VALAPKGS=gtk+-2.0 gdk-2.0
 endif
 
 if ENABLE_GNT
-#targets+=gnt finch
-#INCLUDES+= -I at top_srcdir@/finch
+targets+=gnt finch
+gnt_VALAFLAGS=-I at top_srcdir@/finch/libgnt $(GLIB_CFLAGS)
+gnt_VALAPKGS=curses
+finch_VALAFLAGS=$(purple_VALAFLAGS) $(gnt_VALAFLAGS) -I at top_srcdir@/finch
+finch_VALAPKGS=gnt
 endif
 
 depsfiles = $(addsuffix .deps,$(targets))
@@ -22,11 +26,11 @@ all: $(vapifiles)
 
 all: $(vapifiles)
 
-%.vapi: %.gi
-	$(AM_V_gen)$(VAPIGEN) --pkg gtk+-2.0 --library $* $*.gi
+%.vapi: %.gi %.deps %.metadata
+	$(AM_V_gen)$(VAPIGEN) --vapidir @top_builddir@/vapi $(addprefix --pkg=,$($*_VALAPKGS)) --library $* $*.gi
 
 %.gi: %.files %.namespace
-	$(AM_V_gen)$(VALA_GEN_INTROSPECT) --namespace=`cat @srcdir@/$*.namespace` $(INCLUDES) `cat $*.files` > $*.gi \
+	$(AM_V_gen)$(VALA_GEN_INTROSPECT) --namespace=`cat @srcdir@/$*.namespace` $($*_VALAFLAGS) `cat $*.files` > $*.gi \
 		&& test -s $*.gi
 
 clean: