From 103226eb981de59b2272f71fc6bc2abe66a5ad29 Mon Sep 17 00:00:00 2001
From: Michael Jennings <mej@kainx.org>
Date: Thu, 3 Apr 2003 19:08:17 +0000
Subject: [PATCH] Thu Apr  3 14:06:53 EST 2003 (KainX)

Rearranged include directory order to make sure
local headers are found before system ones.


SVN revision: 6821
---
 ChangeLog           |  8 ++++++++
 demo/Makefile.am    |  8 ++++----
 filters/Makefile.am |  8 ++++----
 libltdl/.cvsignore  | 14 ++++----------
 loaders/Makefile.am |  8 ++++----
 src/Makefile.am     |  8 ++++----
 test/Makefile.am    |  8 ++++----
 7 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 055b3cd..93e4199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2960,3 +2960,11 @@ should no longer be necessary to build it.
 
 _______________________________________________
 
+Thu Apr  3 14:06:53 EST 2003
+(KainX)
+
+Rearranged include directory order to make sure
+local headers are found before system ones.
+
+_______________________________________________
+
diff --git a/demo/Makefile.am b/demo/Makefile.am
index aa95f95..1949412 100644
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -6,10 +6,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in				
 
 LDFLAGS              = -L/usr/X11R6/lib
-INCLUDES             = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \
-                       $(X_CFLAGS) -I$(prefix)/include -I$(includedir) \
-		       -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-		       -I$(top_srcdir)/loaders
+INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+                       -I/usr/X11R6/include $(X_CFLAGS) \
+                       -I$(prefix)/include -I$(includedir)
 
 bin_PROGRAMS         = imlib2_view imconvert
 imconvert_SOURCES    = imconvert.c
diff --git a/filters/Makefile.am b/filters/Makefile.am
index b8b7930..c799ff3 100644
--- a/filters/Makefile.am
+++ b/filters/Makefile.am
@@ -6,10 +6,10 @@ AUTOMAKE_OPTIONS     = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in
 
 LDFLAGS		     = -L/usr/X11R6/lib
-INCLUDES	     = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \
-                       $(X_CFLAGS) -I$(prefix)/include -I$(includedir) \
-		       -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-		       -I$(top_srcdir)/loaders
+INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+                       -I/usr/X11R6/include $(X_CFLAGS) \
+                       -I$(prefix)/include -I$(includedir)
 
 pkgdir		     = $(libdir)/loaders/filter
 pkg_LTLIBRARIES	     = testfilter.la bump_map.la colormod.la
diff --git a/libltdl/.cvsignore b/libltdl/.cvsignore
index 0babb9a..78709aa 100644
--- a/libltdl/.cvsignore
+++ b/libltdl/.cvsignore
@@ -1,21 +1,15 @@
-configure
-configure.in
-config.log
 libtool
-config.h
-config.status
-stamp-h
-Makefile.am
-Makefile.in
-Makefile
+config*
+Makefile*
 .libs
 .deps
 *.lo
 *.la
+*.in
+stamp*
 ltdl.c
 ltdl.h
 acinclude.m4
 aclocal.m4
-config.h.in
 COPYING.LIB
 README
diff --git a/loaders/Makefile.am b/loaders/Makefile.am
index cc1e7f3..d707a1d 100644
--- a/loaders/Makefile.am
+++ b/loaders/Makefile.am
@@ -6,10 +6,10 @@ AUTOMAKE_OPTIONS     = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in
 
 LDFLAGS		     = -L/usr/X11R6/lib -L$(top_builddir)/src
-INCLUDES	     = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \
-                       $(X_CFLAGS) -I$(prefix)/include -I$(includedir) \
-		       -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-		       -I$(top_srcdir)/loaders
+INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+                       -I/usr/X11R6/include $(X_CFLAGS) \
+                       -I$(prefix)/include -I$(includedir)
 
 pkgdir		     = $(libdir)/loaders/image
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 63d9286..a6c4083 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,10 +6,10 @@ AUTOMAKE_OPTIONS     = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in loaderpath.h
 
 LDFLAGS		     = -L/usr/X11R6/lib
-INCLUDES	     = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \
-                       $(X_CFLAGS) -I$(prefix)/include -I$(includedir) \
-		       -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-		       -I$(top_srcdir)/loaders
+INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+                       -I/usr/X11R6/include $(X_CFLAGS) \
+                       -I$(prefix)/include -I$(includedir)
 MMX_SRCS             = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S \
 		       asm_blend_cmod.S
 MMX_OBJS             = $(MMX_SRCS:.S=.lo)
diff --git a/test/Makefile.am b/test/Makefile.am
index afda028..2c20217 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,10 +6,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in				
 
 LDFLAGS              = -L/usr/X11R6/lib
-INCLUDES             = -I/usr/X11R6/include -I$(top_srcdir)/libltdl \
-                       $(X_CFLAGS) -I$(prefix)/include -I$(includedir) \
-		       -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-		       -I$(top_srcdir)/loaders
+INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+		       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+                       -I/usr/X11R6/include $(X_CFLAGS) \
+		       -I$(prefix)/include -I$(includedir)
 
 bin_PROGRAMS         = imlib2 bumpmaptest imlib2_test polytest color_spaces
 imlib2_SOURCES       = main.c