[anjuta] build: 636667 - Plugins require GTK_LIBS to link against, but this is not in configure.ac

[Johannes Schmid <jhs src gnome org>]

commit 29153beb2449c9d3905e718923008c1f2e6036cd
Author: Johannes Schmid <jhs gnome org>
Date:   Tue Dec 14 14:01:50 2010 +0100

    build: 636667 - Plugins require GTK_LIBS to link against, but this is not in configure.ac

 libanjuta/interfaces/Makefile.am.iface |    7 ++++---
 plugins/am-project/tests/anjuta.lst    |   10 +++++-----
 plugins/devhelp/Makefile.am            |    1 -
 plugins/file-loader/Makefile.am        |    2 --
 plugins/gdb/Makefile.am                |    1 -
 plugins/git/Makefile.am                |    1 -
 6 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/libanjuta/interfaces/Makefile.am.iface b/libanjuta/interfaces/Makefile.am.iface
index 03ebe3e..79e1f3d 100644
--- a/libanjuta/interfaces/Makefile.am.iface
+++ b/libanjuta/interfaces/Makefile.am.iface
@@ -1,8 +1,8 @@
 INCLUDES = \
 	$(WARN_CFLAGS) \
-	$(GTK_CFLAGS) \
+	$(XML_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
-	$(LIBANJUTA_CFLAGS) \
+	$(ANJUTA_CFLAGS) \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libanjuta-interfaces\" \
 	"-DG_LOG_FATAL_MASK=\"(G_LOG_FLAG_RECURSION|G_LOG_LEVEL_ERROR|G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING)\""
@@ -10,7 +10,8 @@ INCLUDES = \
 MODULE_NAME = libanjuta-3
 MODULE_VERSION = 2.91
 MODULE_INCLUDEDIR = $(includedir)/libanjuta-3.0/libanjuta/interfaces
-MODULE_LIBS = $(GTK_LIBS)
+MODULE_LIBS = 	$(ANJUTA_LIBS) \
+	$(XML_LIBS)
 
 @@IFACE_RULES@@
 
diff --git a/plugins/am-project/tests/anjuta.lst b/plugins/am-project/tests/anjuta.lst
index c8a53b9..e8da9cf 100644
--- a/plugins/am-project/tests/anjuta.lst
+++ b/plugins/am-project/tests/anjuta.lst
@@ -440,7 +440,7 @@ PROPERTY (URL): [http://www.anjuta.org/]
                     SOURCE (11:6:1:4:0): plugins/gdb/$(plugin_in_files:.plugin.in=.plugin)
                 TARGET (11:6:1:5): libanjuta-gdb.la
                     PROPERTY (Linker flags): $(ANJUTA_PLUGIN_LDFLAGS)
-                    PROPERTY (Additional libraries): $(GTK_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Additional libraries): $(LIBANJUTA_LIBS)
                     SOURCE (11:6:1:5:0): plugins/gdb/gdbmi.c
                     SOURCE (11:6:1:5:1): plugins/gdb/gdbmi.h
                     SOURCE (11:6:1:5:2): plugins/gdb/debugger.c
@@ -452,7 +452,7 @@ PROPERTY (URL): [http://www.anjuta.org/]
                     SOURCE (11:6:1:5:8): plugins/gdb/preferences.c
                     SOURCE (11:6:1:5:9): plugins/gdb/preferences.h
                 TARGET (11:6:1:6): gdbmi-test
-                    PROPERTY (Additional objects): $(GTK_LIBS) $(LIBANJUTA_LIBS) $(LIBXML_LIBS)
+                    PROPERTY (Additional objects): $(LIBANJUTA_LIBS) $(LIBXML_LIBS)
                     PROPERTY (C compiler flags): $(AM_CFLAGS)
                     SOURCE (11:6:1:6:0): plugins/gdb/gdbmi-test.c
                     SOURCE (11:6:1:6:1): plugins/gdb/gdbmi.c
@@ -632,7 +632,7 @@ PROPERTY (URL): [http://www.anjuta.org/]
                     SOURCE (11:6:6:2:0): plugins/file-loader/$(plugin_in_files:.plugin.in=.plugin)
                 TARGET (11:6:6:3): libanjuta-loader.la
                     PROPERTY (Linker flags): $(ANJUTA_PLUGIN_LDFLAGS)
-                    PROPERTY (Additional libraries): $(GTK_LIBS) $(GIO_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Additional libraries): $(GIO_LIBS) $(LIBANJUTA_LIBS)
                     SOURCE (11:6:6:3:0): plugins/file-loader/plugin.c
                     SOURCE (11:6:6:3:1): plugins/file-loader/plugin.h
                     SOURCE (11:6:6:3:2): plugins/file-loader/dnd.c
@@ -1467,7 +1467,7 @@ PROPERTY (URL): [http://www.anjuta.org/]
                     SOURCE (11:6:23:2:0): plugins/devhelp/$(plugin_in_files:.plugin.in=.plugin)
                 TARGET (11:6:23:3): libanjuta-devhelp.la
                     PROPERTY (Linker flags): $(ANJUTA_PLUGIN_LDFLAGS)
-                    PROPERTY (Additional libraries): $(GTK_LIBS) $(LIBANJUTA_LIBS) $(PLUGIN_DEVHELP_LIBS)
+                    PROPERTY (Additional libraries): $(LIBANJUTA_LIBS) $(PLUGIN_DEVHELP_LIBS)
                     SOURCE (11:6:23:3:0): plugins/devhelp/plugin.c
                     SOURCE (11:6:23:3:1): plugins/devhelp/plugin.h
             GROUP (11:6:24): language-manager
@@ -1687,7 +1687,7 @@ PROPERTY (URL): [http://www.anjuta.org/]
                     SOURCE (11:6:26:3:0): plugins/git/$(plugin_in_files:.plugin.in=.plugin)
                 TARGET (11:6:26:4): libanjuta-git.la
                     PROPERTY (Linker flags): $(ANJUTA_PLUGIN_LDFLAGS)
-                    PROPERTY (Additional libraries): $(GTK_LIBS) $(LIBANJUTA_LIBS)
+                    PROPERTY (Additional libraries): $(LIBANJUTA_LIBS)
                     SOURCE (11:6:26:4:0): plugins/git/plugin.c
                     SOURCE (11:6:26:4:1): plugins/git/plugin.h
                     SOURCE (11:6:26:4:2): plugins/git/git-command.c
diff --git a/plugins/devhelp/Makefile.am b/plugins/devhelp/Makefile.am
index ecd4daf..524ab63 100644
--- a/plugins/devhelp/Makefile.am
+++ b/plugins/devhelp/Makefile.am
@@ -44,7 +44,6 @@ libanjuta_devhelp_la_SOURCES = \
 
 # Plugin dependencies
 libanjuta_devhelp_la_LIBADD = \
-	$(GTK_LIBS) \
 	$(LIBANJUTA_LIBS) \
 	$(PLUGIN_DEVHELP_LIBS)
 
diff --git a/plugins/file-loader/Makefile.am b/plugins/file-loader/Makefile.am
index 1ae1343..065cf13 100644
--- a/plugins/file-loader/Makefile.am
+++ b/plugins/file-loader/Makefile.am
@@ -40,8 +40,6 @@ libanjuta_loader_la_SOURCES = \
 libanjuta_loader_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 libanjuta_loader_la_LIBADD = \
-	$(GTK_LIBS) \
-	$(GIO_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 # Plugin dependencies
diff --git a/plugins/gdb/Makefile.am b/plugins/gdb/Makefile.am
index 0de71d9..812f1a2 100644
--- a/plugins/gdb/Makefile.am
+++ b/plugins/gdb/Makefile.am
@@ -33,7 +33,6 @@ plugin_LTLIBRARIES = libanjuta-gdb.la
 libanjuta_gdb_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 libanjuta_gdb_la_LIBADD = \
-	$(GTK_LIBS) \
 	$(LIBANJUTA_LIBS) \
 	$(XML_LIBS)
 
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 46aa34f..28f733d 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -226,7 +226,6 @@ libanjuta_git_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin dependencies
 libanjuta_git_la_LIBADD = \
-	$(GTK_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 EXTRA_DIST = \