From 3341e94420b8ce294ca05bfa8e3f07591b93fefa Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Tue, 13 Nov 2012 20:24:30 +0000
Subject: [PATCH] Centralized the definition of the INCDIR script in
 tools/Config.mk

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5346 42af7a65-404d-4744-a932-0658087f49c3
---
 interpreters/ficl/Makefile       | 3 ---
 modbus/ascii/Make.defs           | 2 +-
 modbus/functions/Make.defs       | 2 +-
 modbus/nuttx/Make.defs           | 2 +-
 modbus/rtu/Make.defs             | 2 +-
 modbus/tcp/Make.defs             | 2 +-
 netutils/thttpd/cgi-src/Makefile | 4 ++--
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/interpreters/ficl/Makefile b/interpreters/ficl/Makefile
index e905b9eff..550c2fd2d 100644
--- a/interpreters/ficl/Makefile
+++ b/interpreters/ficl/Makefile
@@ -35,14 +35,11 @@
 
 BUILDDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
 # Tools
 
-INCDIR = $(TOPDIR)/tools/incdir.sh
-
 ifeq ($(WINTOOL),y)
 INCDIROPT = -w
 endif
diff --git a/modbus/ascii/Make.defs b/modbus/ascii/Make.defs
index 3e9967283..d4cb38f97 100644
--- a/modbus/ascii/Make.defs
+++ b/modbus/ascii/Make.defs
@@ -39,6 +39,6 @@ CSRCS += mbascii.c
 
 DEPPATH += --dep-path ascii
 VPATH += :ascii
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/ascii}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/ascii}
 
 endif
diff --git a/modbus/functions/Make.defs b/modbus/functions/Make.defs
index 48f60d506..ba4a243c1 100644
--- a/modbus/functions/Make.defs
+++ b/modbus/functions/Make.defs
@@ -38,4 +38,4 @@ CSRCS += mbfuncinput.c mbfuncother.c mbutils.c
 
 DEPPATH += --dep-path functions
 VPATH += :functions
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/functions}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/functions}
diff --git a/modbus/nuttx/Make.defs b/modbus/nuttx/Make.defs
index 96484217b..3990ccd97 100644
--- a/modbus/nuttx/Make.defs
+++ b/modbus/nuttx/Make.defs
@@ -37,4 +37,4 @@ CSRCS += portevent.c portother.c portserial.c porttimer.c
 
 DEPPATH += --dep-path nuttx
 VPATH += :nuttx
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/nuttx}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/nuttx}
diff --git a/modbus/rtu/Make.defs b/modbus/rtu/Make.defs
index 8b9c68c77..d9e3b29c0 100644
--- a/modbus/rtu/Make.defs
+++ b/modbus/rtu/Make.defs
@@ -39,6 +39,6 @@ CSRCS += mbcrc.c mbrtu.c
 
 DEPPATH += --dep-path rtu
 VPATH += :rtu
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/rtu}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/rtu}
 
 endif
diff --git a/modbus/tcp/Make.defs b/modbus/tcp/Make.defs
index 30860be3a..4cd2adb75 100644
--- a/modbus/tcp/Make.defs
+++ b/modbus/tcp/Make.defs
@@ -39,6 +39,6 @@ CSRCS += mbtcp.c
 
 DEPPATH += --dep-path tcp
 VPATH += :tcp
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/tcp}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/tcp}
 
 endif
diff --git a/netutils/thttpd/cgi-src/Makefile b/netutils/thttpd/cgi-src/Makefile
index 60efb08e7..bb8e36457 100644
--- a/netutils/thttpd/cgi-src/Makefile
+++ b/netutils/thttpd/cgi-src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # apps/netutils/cgi-src/Makefile
 #
-#   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,7 @@ ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
 endif
 
-CFLAGS		+= ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" "$(APPDIR)/netutils/thttpd" "$(APPDIR)/netutils/thttpd/cgi-src"}
+CFLAGS		+= ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)/netutils/thttpd" "$(APPDIR)/netutils/thttpd/cgi-src"}
 CGIBINDIR	= $(APPDIR)/netutils/thttpd/cgi-bin
 CLEANFILES	= *.o redirect ssi phf