cpw.qulogic.vala: 7903facf: Adding the correct packages in the .deps...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 7903facfb6c8ec851e42e2b494767dbb7886aa2c
Parent:   951fe3f969121da57118847dc3b48f20033431a0
Author:   qulogic at pidgin.im
Date:     12/23/10 21:46:26
Branch:   im.pidgin.cpw.qulogic.vala
URL: http://d.pidgin.im/viewmtn/revision/info/7903facfb6c8ec851e42e2b494767dbb7886aa2c

Changelog: 

Adding the correct packages in the .deps files means I don't need to
specify them on the command-line. And they need to be in the .deps for
other things to use them properly, anyway.

Changes against parent 951fe3f969121da57118847dc3b48f20033431a0

  patched  vala/vapi/Makefile.am
  patched  vala/vapi/pidgin.deps.in

-------------- next part --------------
============================================================
--- vala/vapi/Makefile.am	81a2b435bcaf391a29a4ce86aa40e660a348f8c7
+++ vala/vapi/Makefile.am	0d6967d6f72b7264918137f5901efd0574ff8208
@@ -7,7 +7,6 @@ pidgin_VALAFLAGS=$(purple_VALAFLAGS) -I@
 if ENABLE_GTK
 targets+=pidgin
 pidgin_VALAFLAGS=$(purple_VALAFLAGS) -I at top_srcdir@/pidgin $(GTK_CFLAGS)
-pidgin_VALAPKGS=gtk+-2.0 gdk-2.0
 
 pidgin.vapi: purple.vapi
 endif
@@ -15,9 +14,7 @@ gnt_VALAFLAGS=-I at top_srcdir@/finch/libgn
 if ENABLE_GNT
 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
 
 finch.vapi: gnt.vapi purple.vapi
 endif
@@ -32,7 +29,7 @@ all: $(vapifiles) $(gifiles)
 all: $(vapifiles) $(gifiles)
 
 %.vapi: %.gi %.deps %.metadata
-	$(AM_V_gen)$(VAPIGEN) --vapidir @top_builddir@/vapi $(addprefix --pkg=,$($*_VALAPKGS)) --library $* $*.gi
+	$(AM_V_gen)$(VAPIGEN) --vapidir @top_builddir@/vapi --library $* $*.gi
 
 %.gi: %.files %.namespace
 	$(AM_V_gen)$(VALA_GEN_INTROSPECT) --namespace=`cat @srcdir@/$*.namespace` $($*_VALAFLAGS) `cat $*.files` > $*.gi \
============================================================
--- vala/vapi/pidgin.deps.in	3530abc0a2dfc2daa0278b94ef68573269d60ff4
+++ vala/vapi/pidgin.deps.in	4ed4fa18fd6d1c502de99456fe12c2d16e1b0ec1
@@ -1,3 +1,5 @@ glib-2.0
 glib-2.0
+gdk-2.0
+gtk+-2.0
 purple