[gnome-builder/wip/chergert/perspective] build: drop BUILDER_CFLAGS and BUILDER_LIBS

From: Christian Hergert <chergert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-builder/wip/chergert/perspective] build: drop BUILDER_CFLAGS and BUILDER_LIBS
Date: Tue, 17 Nov 2015 23:09:48 +0000 (UTC)
commit e61ce441820c6ff2e2e132cb8f752ce9accef62d
Author: Christian Hergert <christian hergert me>
Date:   Tue Nov 17 15:01:26 2015 -0800

    build: drop BUILDER_CFLAGS and BUILDER_LIBS

 configure.ac                       |    6 +-----
 plugins/autotools/Makefile.am      |    2 +-
 plugins/c-pack/Makefile.am         |    2 +-
 plugins/clang/Makefile.am          |    2 +-
 plugins/command-bar/Makefile.am    |    6 +-----
 plugins/ctags/Makefile.am          |    2 +-
 plugins/devhelp/Makefile.am        |   12 +-----------
 plugins/device-manager/Makefile.am |   12 +-----------
 plugins/file-search/Makefile.am    |    2 --
 plugins/mingw/Makefile.am          |    2 +-
 plugins/project-tree/Makefile.am   |    3 +--
 plugins/python-pack/Makefile.am    |    2 +-
 plugins/symbol-tree/Makefile.am    |    2 --
 plugins/sysmon/Makefile.am         |    6 +-----
 plugins/terminal/Makefile.am       |    2 --
 src/Makefile.am                    |    4 ++--
 16 files changed, 14 insertions(+), 53 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e488738..a414c52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,11 +161,6 @@ m4_define([pygobject_required_version], [3.0.0])
 m4_define([libxml_required_version], [2.9.0])
 m4_define([peas_required_version], [1.16.0])
 
-PKG_CHECK_MODULES(BUILDER,  [gtk+-3.0 >= gtk_required_version
-                             gio-2.0 >= glib_required_version
-                             gtksourceview-3.0 >= gtksourceview_required_version
-                             libgit2-glib-1.0 >= ggit_required_version
-                             libpeas-1.0 >= peas_required_version])
 PKG_CHECK_MODULES(EGG,      [glib-2.0 >= glib_required_version
                              gtk+-3.0 >= gtk_required_version])
 PKG_CHECK_MODULES(GD,       [gtk+-3.0 >= gtk_required_version])
@@ -179,6 +174,7 @@ PKG_CHECK_MODULES(ICONS,    [gio-2.0 >= glib_required_version])
 PKG_CHECK_MODULES(LIBGITG,  [libgit2-glib-1.0 >= ggit_required_version])
 PKG_CHECK_MODULES(LIBIDE,   [gio-2.0 >= glib_required_version
                              gio-unix-2.0 >= glib_required_version
+                            gtk+-3.0 >= gtk_required_version
                              gtksourceview-3.0 >= gtksourceview_required_version
                              libgit2-glib-1.0 >= ggit_required_version
                              libpeas-1.0 >= peas_required_version
diff --git a/plugins/autotools/Makefile.am b/plugins/autotools/Makefile.am
index 9a01356..acc7693 100644
--- a/plugins/autotools/Makefile.am
+++ b/plugins/autotools/Makefile.am
@@ -21,7 +21,7 @@ libautotools_plugin_la_SOURCES = \
        $(NULL)
 
 libautotools_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/libide \
        $(NULL)
diff --git a/plugins/c-pack/Makefile.am b/plugins/c-pack/Makefile.am
index 241aace..f039860 100644
--- a/plugins/c-pack/Makefile.am
+++ b/plugins/c-pack/Makefile.am
@@ -17,7 +17,7 @@ libc_pack_plugin_la_SOURCES = \
        $(NULL)
 
 libc_pack_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
        $(NULL)
 
diff --git a/plugins/clang/Makefile.am b/plugins/clang/Makefile.am
index 7696ba1..deb4537 100644
--- a/plugins/clang/Makefile.am
+++ b/plugins/clang/Makefile.am
@@ -31,7 +31,7 @@ libclang_plugin_la_SOURCES = \
        $(NULL)
 
 libclang_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        $(CLANG_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
diff --git a/plugins/command-bar/Makefile.am b/plugins/command-bar/Makefile.am
index 6876299..20bc6fa 100644
--- a/plugins/command-bar/Makefile.am
+++ b/plugins/command-bar/Makefile.am
@@ -41,15 +41,11 @@ libcommand_bar_la_CFLAGS = \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/contrib/gd \
        -I$(top_srcdir)/contrib/nautilus \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        $(DEBUG_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        $(NULL)
 
-libcommand_bar_la_LIBADD = \
-       $(BUILDER_LIBS) \
-       $(NULL)
-
 libcommand_bar_la_LDFLAGS = \
        $(OPTIMIZE_LDFLAGS) \
        -avoid-version \
diff --git a/plugins/ctags/Makefile.am b/plugins/ctags/Makefile.am
index 3732ecd..fa10c3f 100644
--- a/plugins/ctags/Makefile.am
+++ b/plugins/ctags/Makefile.am
@@ -26,7 +26,7 @@ libctags_plugin_la_SOURCES = \
        $(NULL)
 
 libctags_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/libide/util \
diff --git a/plugins/devhelp/Makefile.am b/plugins/devhelp/Makefile.am
index f45756d..5a8ac12 100644
--- a/plugins/devhelp/Makefile.am
+++ b/plugins/devhelp/Makefile.am
@@ -27,23 +27,13 @@ libdevhelp_plugin_la_SOURCES = \
        $(NULL)
 
 libdevhelp_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        $(DEVHELP_CFLAGS) \
-       -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/documents \
-       -I$(top_srcdir)/src/editor \
-       -I$(top_srcdir)/src/search \
-       -I$(top_srcdir)/src/views \
-       -I$(top_srcdir)/src/util \
-       -I$(top_srcdir)/src/workbench \
-       -I$(top_srcdir)/src/workspace \
        -I$(top_srcdir)/libide \
        $(NULL)
 
 libdevhelp_plugin_la_LIBADD = \
-       $(BUILDER_LIBS) \
        $(DEVHELP_LIBS) \
-       $(top_builddir)/libide/libide-1.0.la \
        $(NULL)
 
 libdevhelp_plugin_la_LDFLAGS = \
diff --git a/plugins/device-manager/Makefile.am b/plugins/device-manager/Makefile.am
index 3292fa9..4c38013 100644
--- a/plugins/device-manager/Makefile.am
+++ b/plugins/device-manager/Makefile.am
@@ -17,19 +17,10 @@ libdevice_manager_la_SOURCES = \
        $(NULL)
 
 libdevice_manager_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
-       -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/tree \
-       -I$(top_srcdir)/src/workbench \
-       -I$(top_srcdir)/src/workspace \
+       $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
        $(NULL)
 
-libdevice_manager_la_LIBADD = \
-       $(BUILDER_LIBS) \
-       $(top_builddir)/libide/libide-1.0.la \
-       $(NULL)
-
 libdevice_manager_la_LDFLAGS = \
        -avoid-version \
        -module \
@@ -39,7 +30,6 @@ nodist_libdevice_manager_la_SOURCES = \
        gb-device-manager-resources.c \
        gb-device-manager-resources.h
 
-
 glib_resources_c = gb-device-manager-resources.c
 glib_resources_h = gb-device-manager-resources.h
 glib_resources_xml = gb-device-manager.gresource.xml
diff --git a/plugins/file-search/Makefile.am b/plugins/file-search/Makefile.am
index 7449b23..6634434 100644
--- a/plugins/file-search/Makefile.am
+++ b/plugins/file-search/Makefile.am
@@ -14,7 +14,6 @@ libfile_search_la_SOURCES = \
        $(NULL)
 
 libfile_search_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/search \
@@ -24,7 +23,6 @@ libfile_search_la_CFLAGS = \
        $(NULL)
 
 libfile_search_la_LIBADD = \
-       $(BUILDER_LIBS) \
        $(top_builddir)/contrib/search/libsearch.la \
        $(NULL)
 
diff --git a/plugins/mingw/Makefile.am b/plugins/mingw/Makefile.am
index 66c9bea..84aa9a4 100644
--- a/plugins/mingw/Makefile.am
+++ b/plugins/mingw/Makefile.am
@@ -15,7 +15,7 @@ libmingw_plugin_la_SOURCES = \
        $(NULL)
 
 libmingw_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
        $(NULL)
 
diff --git a/plugins/project-tree/Makefile.am b/plugins/project-tree/Makefile.am
index f5f7fa8..f1ec14f 100644
--- a/plugins/project-tree/Makefile.am
+++ b/plugins/project-tree/Makefile.am
@@ -30,9 +30,9 @@ libproject_tree_plugin_la_SOURCES = \
 
 libproject_tree_plugin_la_CFLAGS = \
        $(LIBIDE_CFLAGS) \
-       $(BUILDER_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        $(DEBUG_CFLAGS) \
+       $(TERMINAL_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/src/tree \
        -I$(top_srcdir)/src/util \
@@ -44,7 +44,6 @@ endif
 
 libproject_tree_plugin_la_LIBADD = \
        $(LIBIDE_LIBS) \
-       $(BUILDER_LIBS) \
        $(top_builddir)/libide/libide-1.0.la \
        $(NULL)
 
diff --git a/plugins/python-pack/Makefile.am b/plugins/python-pack/Makefile.am
index ade3846..16f6f65 100644
--- a/plugins/python-pack/Makefile.am
+++ b/plugins/python-pack/Makefile.am
@@ -15,7 +15,7 @@ libpython_pack_plugin_la_SOURCES = \
        $(NULL)
 
 libpython_pack_plugin_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
        $(NULL)
 
diff --git a/plugins/symbol-tree/Makefile.am b/plugins/symbol-tree/Makefile.am
index 7ccc1eb..4aa18c8 100644
--- a/plugins/symbol-tree/Makefile.am
+++ b/plugins/symbol-tree/Makefile.am
@@ -20,7 +20,6 @@ libsymbol_tree_la_SOURCES = \
 
 # XXX: temporary, since we need to extract lots of src/ into plugins
 libsymbol_tree_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/documents \
        -I$(top_srcdir)/src/editor \
@@ -34,7 +33,6 @@ libsymbol_tree_la_CFLAGS = \
        $(NULL)
 
 libsymbol_tree_la_LIBADD = \
-       $(BUILDER_LIBS) \
        $(top_builddir)/libide/libide-1.0.la \
        $(NULL)
 
diff --git a/plugins/sysmon/Makefile.am b/plugins/sysmon/Makefile.am
index 8b1a8f9..e7cd6de 100644
--- a/plugins/sysmon/Makefile.am
+++ b/plugins/sysmon/Makefile.am
@@ -22,17 +22,13 @@ nodist_libsysmon_la_SOURCES = \
        $(NULL)
 
 libsysmon_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        -I$(top_srcdir)/libide \
-       -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/workbench \
-       -I$(top_srcdir)/src/workspace \
        -I$(top_srcdir)/contrib/egg \
        -I$(top_srcdir)/contrib/rg \
        $(NULL)
 
 libsysmon_la_LIBADD = \
-       $(BUILDER_LIBS) \
        $(top_builddir)/contrib/rg/librg.la \
        $(NULL)
 
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index d64f931..0534e51 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -31,7 +31,6 @@ nodist_libterminal_la_SOURCES = \
        $(NULL)
 
 libterminal_la_CFLAGS = \
-       $(BUILDER_CFLAGS) \
        $(TERMINAL_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/src \
@@ -45,7 +44,6 @@ libterminal_la_CFLAGS = \
        $(NULL)
 
 libterminal_la_LIBADD = \
-       $(BUILDER_LIBS) \
        $(TERMINAL_LIBS) \
        $(NULL)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5ad3aec..6c20762 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ gnome_builder_SOURCES = main.c
 
 gnome_builder_CFLAGS = \
        -DPACKAGE_LOCALE_DIR=\""${datadir}/locale"\" \
-       $(BUILDER_CFLAGS) \
+       $(LIBIDE_CFLAGS) \
        $(DEBUG_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
        $(TERMINAL_CFLAGS) \
@@ -14,7 +14,7 @@ gnome_builder_CFLAGS = \
        $(NULL)
 
 gnome_builder_LDADD = \
-       $(BUILDER_LIBS) \
+       $(LIBIDE_LIBS) \
        $(top_builddir)/contrib/egg/libegg-private.la \
        $(top_builddir)/data/icons/hicolor/libicons.la \
        $(top_builddir)/libide/libide-1.0.la \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]