[anjuta] bgo#590334 – Fix -I ordering

[Sebastien Granjoux <sgranjoux src gnome org>]

commit dc8e3a1bece9a699ac1e7df415c081b21bb790bb
Author: Daniel Macks <dmacks netspace org>
Date:   Sat Aug 1 19:36:39 2009 +0200

    bgo#590334 â?? Fix -I ordering

 launcher/Makefile.am       |    2 +-
 libanjuta/Makefile.am      |    3 ++-
 plugins/search/Makefile.am |    1 -
 src/Makefile.am            |    5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/launcher/Makefile.am b/launcher/Makefile.am
index 5347ca0..c41129c 100644
--- a/launcher/Makefile.am
+++ b/launcher/Makefile.am
@@ -1,5 +1,5 @@
 
-AM_CPPFLAGS = $(GLIB_CFLAGS) -I. -I.. -g -O $(DEPRECATED_FLAGS)
+AM_CPPFLAGS = -I. -I.. $(GLIB_CFLAGS) -g -O $(DEPRECATED_FLAGS)
 
 bin_PROGRAMS = anjuta-launcher
 anjuta_launcher_LDADD = $(GLIB_LIBS)
diff --git a/libanjuta/Makefile.am b/libanjuta/Makefile.am
index 970e08a..7cc7d71 100644
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@ -2,13 +2,14 @@
 SUBDIRS = interfaces 
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I . \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GTK_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(GLADE_DEPRECATED_CFLAGS) \
 	$(LIBXML_CFLAGS) \
-	-I$(top_srcdir) \
 	-DDATADIR="\"$(datadir)\"" \
 	-DPACKAGE_PIXMAPS_DIR="\"$(datadir)/pixmaps/$(PACKAGE)\"" \
 	-DPACKAGE_DATA_DIR="\"$(datadir)/$(PACKAGE)\"" \
diff --git a/plugins/search/Makefile.am b/plugins/search/Makefile.am
index d6b0e3c..ae5482e 100644
--- a/plugins/search/Makefile.am
+++ b/plugins/search/Makefile.am
@@ -25,7 +25,6 @@ AM_CPPFLAGS = \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(LIBANJUTA_CFLAGS) \
-	-I$(top_srcdir)/tagmanager/include \
 	-DG_LOG_DOMAIN=\"libanjuta-search\"
 
 libanjuta_search_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index b4a18f6..832a5eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,9 +16,10 @@ anjuta_pixmaps_DATA = \
 	anjuta-preferences-general-48.png
 
 AM_CPPFLAGS = \
-	$(LIBANJUTA_CFLAGS) \
 	-I$(top_srcdir)\
-	-I.. -I. -DPACKAGE_BIN_DIR=\"$(bindir)\" \
+	-I.. -I. \
+	$(LIBANJUTA_CFLAGS) \
+	-DPACKAGE_BIN_DIR=\"$(bindir)\" \
 	-DPACKAGE_DATA_DIR="\"$(datadir)/$(PACKAGE)\"" \
 	-DPACKAGE_DOC_DIR=\"$(docdir)\" \
 	-DPACKAGE_PIXMAPS_DIR=\"$(datadir)/pixmaps/$(PACKAGE)\" \