[gnome-builder] build: more build flags fallout

[Christian Hergert <chergert src gnome org>]

commit 0664c8e46af4ad84c456c8b81af6d73d4680146f
Author: Christian Hergert <christian hergert me>
Date:   Tue Nov 17 15:09:25 2015 -0800

    build: more build flags fallout

 plugins/fallback/Makefile.am              |    4 +++-
 plugins/file-search/Makefile.am           |    5 +----
 plugins/gnome-code-assistance/Makefile.am |    2 +-
 plugins/html-completion/Makefile.am       |    3 ++-
 plugins/symbol-tree/Makefile.am           |   15 ++-------------
 plugins/terminal/Makefile.am              |    8 +-------
 plugins/vala-pack/Makefile.am             |    3 +--
 plugins/xml-pack/Makefile.am              |    2 +-
 8 files changed, 12 insertions(+), 30 deletions(-)
---
diff --git a/plugins/fallback/Makefile.am b/plugins/fallback/Makefile.am
index f0fa93d..319e74f 100644
--- a/plugins/fallback/Makefile.am
+++ b/plugins/fallback/Makefile.am
@@ -9,11 +9,13 @@ libfallback_plugin_la_SOURCES = \
        $(NULL)
 
 libfallback_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
+       $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
        $(NULL)
 
 libfallback_plugin_la_LDFLAGS = \
+       $(OPTIMIZE_LDFLAGS) \
        -avoid-version \
        -module \
        $(NULL)
diff --git a/plugins/file-search/Makefile.am b/plugins/file-search/Makefile.am
index 6634434..c17e1c0 100644
--- a/plugins/file-search/Makefile.am
+++ b/plugins/file-search/Makefile.am
@@ -14,11 +14,8 @@ libfile_search_la_SOURCES = \
        $(NULL)
 
 libfile_search_la_CFLAGS = \
+       $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
-       -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/search \
-       -I$(top_srcdir)/src/util \
-       -I$(top_srcdir)/src/workbench \
        -I$(top_srcdir)/contrib/search \
        $(NULL)
 
diff --git a/plugins/gnome-code-assistance/Makefile.am b/plugins/gnome-code-assistance/Makefile.am
index 18fb740..0edef96 100644
--- a/plugins/gnome-code-assistance/Makefile.am
+++ b/plugins/gnome-code-assistance/Makefile.am
@@ -21,7 +21,7 @@ libgnome_code_assistance_plugin_la_SOURCES = \
        $(NULL)
 
 libgnome_code_assistance_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
        $(NULL)
 
diff --git a/plugins/html-completion/Makefile.am b/plugins/html-completion/Makefile.am
index 0557ac0..eaf553e 100644
--- a/plugins/html-completion/Makefile.am
+++ b/plugins/html-completion/Makefile.am
@@ -12,7 +12,8 @@ libhtml_completion_plugin_la_SOURCES = \
        $(NULL)
 
 libhtml_completion_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
+       $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/contrib/search \
        -I$(top_srcdir)/libide \
        $(NULL)
diff --git a/plugins/symbol-tree/Makefile.am b/plugins/symbol-tree/Makefile.am
index 4aa18c8..f63c0e5 100644
--- a/plugins/symbol-tree/Makefile.am
+++ b/plugins/symbol-tree/Makefile.am
@@ -18,24 +18,13 @@ libsymbol_tree_la_SOURCES = \
        symbol-tree.h \
        $(NULL)
 
-# XXX: temporary, since we need to extract lots of src/ into plugins
 libsymbol_tree_la_CFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/documents \
-       -I$(top_srcdir)/src/editor \
-       -I$(top_srcdir)/src/views \
-       -I$(top_srcdir)/src/tree \
-       -I$(top_srcdir)/src/util \
-       -I$(top_srcdir)/src/workbench \
-       -I$(top_srcdir)/src/workspace \
+       $(LIBIDE_CFLAGS) \
+       $(OPTIMIZE_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
        $(NULL)
 
-libsymbol_tree_la_LIBADD = \
-       $(top_builddir)/libide/libide-1.0.la \
-       $(NULL)
-
 libsymbol_tree_la_LDFLAGS = \
        $(OPTIMIZE_LDFLAGS) \
        -avoid-version \
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index 0534e51..b781e29 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -31,15 +31,9 @@ nodist_libterminal_la_SOURCES = \
        $(NULL)
 
 libterminal_la_CFLAGS = \
+       $(LIBIDE_CFLAGS) \
        $(TERMINAL_CFLAGS) \
        -I$(top_srcdir)/libide \
-       -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/app \
-       -I$(top_srcdir)/src/documents \
-       -I$(top_srcdir)/src/util \
-       -I$(top_srcdir)/src/views \
-       -I$(top_srcdir)/src/workbench \
-       -I$(top_srcdir)/src/workspace \
        -I$(top_srcdir)/contrib/egg \
        $(NULL)
 
diff --git a/plugins/vala-pack/Makefile.am b/plugins/vala-pack/Makefile.am
index 4a67e08..7b9f490 100644
--- a/plugins/vala-pack/Makefile.am
+++ b/plugins/vala-pack/Makefile.am
@@ -35,11 +35,10 @@ libvala_pack_plugin_la_VALAFLAGS = \
 
 libvala_pack_plugin_la_CFLAGS = \
        -DG_LOG_DOMAIN=\"vala-pack-plugin\" \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        $(VALA_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
-       -I$(top_srcdir)/src/util \
        $(NULL)
 
 libvala_pack_plugin_la_LDFLAGS = \
diff --git a/plugins/xml-pack/Makefile.am b/plugins/xml-pack/Makefile.am
index c454010..b8d1a17 100644
--- a/plugins/xml-pack/Makefile.am
+++ b/plugins/xml-pack/Makefile.am
@@ -17,7 +17,7 @@ libxml_pack_plugin_la_SOURCES = \
        $(NULL)
 
 libxml_pack_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/contrib/xml \