From: Mark Lee <marklee@src.gnome.org>
Date: Mon, 8 Jun 2009 06:58:49 +0000 (-0700)
Subject: vapigen: Do not doubly-link to the static libgee
X-Git-Tag: 0.7.5~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=025ddf837d6d549bed508863e0925b3f26631e5b;p=thirdparty%2Fvala.git

vapigen: Do not doubly-link to the static libgee

In the Vala Team PPA, it was reported that the vapigen binary did not run,
due to the fact that Gee classes were being registered multiple times. The
problem was fixed by removing the explicit reference to libgee in LDADD, as
it is already included via libvala.

Fixes bug 585120.
---

diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index 55fb4e176..43b6ee8fe 100644
--- a/vapigen/Makefile.am
+++ b/vapigen/Makefile.am
@@ -52,14 +52,12 @@ vapicheck.vala.stamp: $(vapicheck_VALASOURCES)
 
 vapigen_LDADD = \
 	$(GLIB_LIBS) \
-	../gee/libgee.la \
 	../codegen/libvala.la \
 	../gobject-introspection/libgidl.la \
 	$(NULL)
 
 vapicheck_LDADD = \
 	$(GLIB_LIBS) \
-	../gee/libgee.la \
 	../codegen/libvala.la \
 	../gobject-introspection/libgidl.la \
 	$(NULL)