From d511432dfd6974e43b054e98334cf529a42f600b Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Sat, 16 Sep 2006 18:57:40 +0000
Subject: Fix include order

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@61 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 lib/Makefile      | 4 ++--
 lib/util/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/Makefile b/lib/Makefile
index 87ad860a..704b838a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -55,8 +55,6 @@ DATAFILES = rgb.txt
 .PHONY: all
 all: libnetpbm extra_staticlib
 
-INCLUDES = -I$(SRCDIR)/$(SUBDIR) -I. -Iimportinc
-
 SUBDIRS = util
 SCRIPTS = 
 BINARIES = 
@@ -64,6 +62,8 @@ BINARIES =
 OMIT_LIBRARY_RULE = 1
 include $(SRCDIR)/Makefile.common
 
+INCLUDES = -I$(SRCDIR)/$(SUBDIR) -I. -Iimportinc
+
 # The following must go after Makefile.common because $(LIBNETPBM) may 
 # contain a reference to $(NETPBM_MAJOR_RELEASE).
 .PHONY: libnetpbm
diff --git a/lib/util/Makefile b/lib/util/Makefile
index 4ba60ba2..ffa1db5b 100644
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -7,8 +7,6 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
 
 include $(BUILDDIR)/Makefile.config
 
-INCLUDES = -I $(BUILDDIR) -I $(SRCDIR)/$(SUBDIR)/..
-
 # nstring is required for asprintf(), etc.  Also some systems don't have
 # snprintf(), e.g. Solaris 2.5.1.  2002.03.29.
 UTILOBJECTS = shhopt.o nstring.o vasprintf.o filename.o
@@ -19,6 +17,8 @@ all: $(UTILOBJECTS)
 
 include $(SRCDIR)/Makefile.common
 
+INCLUDES = -I $(BUILDDIR) -I $(SRCDIR)/$(SUBDIR)/..
+
 $(UTILOBJECTS):%.o:%.c importinc
 	$(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) $(CFLAGS_SHLIB) \
 	  $(CFLAGS_PERSONAL) $(CADD) -o $@ $<
-- 
cgit 1.4.1