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 55fb4e176752fdb9ed7325e20368489309e9f46a..43b6ee8fe2dd9848e7283fe34558eb34082841c2 100644 (file)
--- 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)