From fbff639e6e1ca7ca3cd36877551cab3bc4cfac79 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Sat, 16 May 2009 18:20:06 +0200
Subject: [PATCH] use CB_SDK_INCLUDES variable for common set of include directories used in Makefile.am
---
configure.in | 3 +++
src/plugins/astyle/Makefile.am | 6 ++----
src/plugins/autosave/Makefile.am | 4 +---
src/plugins/classwizard/Makefile.am | 4 +---
src/plugins/codecompletion/Makefile.am | 6 ++----
src/plugins/compilergcc/Makefile.am | 4 +---
src/plugins/contrib/AutoVersioning/Makefile.am | 4 +---
src/plugins/contrib/BrowseTracker/Makefile.am | 4 +---
src/plugins/contrib/HexEditor/Makefile.am | 4 +---
src/plugins/contrib/IncrementalSearch/Makefile.am | 4 +---
src/plugins/contrib/ThreadSearch/Makefile.am | 4 +---
src/plugins/contrib/Valgrind/Makefile.am | 4 +---
src/plugins/contrib/byogames/Makefile.am | 4 +---
src/plugins/contrib/cb_koders/Makefile.am | 4 +---
src/plugins/contrib/codesnippets/Makefile.am | 4 +---
src/plugins/contrib/codestat/Makefile.am | 4 +---
src/plugins/contrib/dragscroll/Makefile.am | 6 ++----
src/plugins/contrib/envvars/Makefile.am | 4 +---
src/plugins/contrib/headerfixup/Makefile.am | 4 +---
src/plugins/contrib/help_plugin/Makefile.am | 4 +---
src/plugins/contrib/keybinder/Makefile.am | 4 +---
src/plugins/contrib/lib_finder/Makefile.am | 4 +---
src/plugins/contrib/profiler/Makefile.am | 4 +---
src/plugins/contrib/regex_testbed/Makefile.am | 4 +---
src/plugins/contrib/source_exporter/Makefile.am | 4 +---
src/plugins/contrib/symtab/Makefile.am | 4 +---
src/plugins/contrib/wxSmith/plugin/Makefile.am | 4 +---
src/plugins/contrib/wxSmith/properties/Makefile.am | 4 +---
src/plugins/contrib/wxSmith/wxwidgets/Makefile.am | 4 +---
.../contrib/wxSmith/wxwidgets/defitems/Makefile.am | 4 +---
.../wxSmith/wxwidgets/properties/Makefile.am | 4 +---
.../contrib/wxSmithContribItems/Makefile.am | 4 +---
src/plugins/debuggergdb/Makefile.am | 4 +---
src/plugins/defaultmimehandler/Makefile.am | 4 +---
src/plugins/openfileslist/Makefile.am | 4 +---
src/plugins/projectsimporter/Makefile.am | 4 +---
src/plugins/scriptedwizard/Makefile.am | 4 +---
src/plugins/todo/Makefile.am | 4 +---
src/plugins/xpmanifest/Makefile.am | 4 +---
src/sdk/Makefile.am | 4 +---
src/src/Makefile.am | 4 +---
41 files changed, 46 insertions(+), 123 deletions(-)
diff --git a/configure.in b/configure.in
index 114e822..a2c9b79 100644
--- a/configure.in
+++ b/configure.in
@@ -194,6 +194,9 @@ CPPFLAGS="$CPPFLAGS -Ulinux -Uunix"
CXXFLAGS="$CXXFLAGS $PCH_FLAGS $PIC_FLAGS -fexceptions"
AC_SUBST(codeblocks_PCH_FLAGS, "$PCH_FLAGS")
+CB_SDK_INCLUDES="\$(WX_CXXFLAGS) -I\$(top_srcdir)/src/include -I\$(top_srcdir)/src/include/wxscintilla/include"
+AC_SUBST(CB_SDK_INCLUDES)
+
dnl AM_PATH_GTK(1.2.7, ,
dnl AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?),
dnl gthread)
diff --git a/src/plugins/astyle/Makefile.am b/src/plugins/astyle/Makefile.am
index 55b5f75..9670d00 100644
--- a/src/plugins/astyle/Makefile.am
+++ b/src/plugins/astyle/Makefile.am
@@ -1,9 +1,7 @@
SUBDIRS = resources
-INCLUDES = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/plugins/astyle/astyle \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/include/wxscintilla/include
+INCLUDES = $(CB_SDK_INCLUDES) \
+ -I$(top_srcdir)/src/plugins/astyle/astyle
pluginlibdir = $(pkglibdir)/plugins
diff --git a/src/plugins/autosave/Makefile.am b/src/plugins/autosave/Makefile.am
index b8aea57..c14a83f 100644
--- a/src/plugins/autosave/Makefile.am
+++ b/src/plugins/autosave/Makefile.am
@@ -1,6 +1,4 @@
-INCLUDES = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/include/wxscintilla/include
+INCLUDES = $(CB_SDK_INCLUDES)
pluginlibdir = $(pkglibdir)/plugins
diff --git a/src/plugins/classwizard/Makefile.am b/src/plugins/classwizard/Makefile.am
index 41fbaf4..bbf9fec 100644
--- a/src/plugins/classwizard/Makefile.am
+++ b/src/plugins/classwizard/Makefile.am
@@ -1,8 +1,6 @@
SUBDIRS = resources
-INCLUDES = $(WX_CXXFLAGS) \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/include/wxscintilla/include
+INCLUDES = $(CB_SDK_INCLUDES)
pluginlibdir = $(pkglibdir)/plugins
diff --git a/src/plugins/codecompletion/Makefile.am b/src/plugins/codecompletion/Makefile.am
index f5149fe..3419ae7 100644
--- a/src/plugins/codecompl
download for full patch...