sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Centralized the definition of the INCDIR script in tools/Config.mk

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5346 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-11-13 20:24:30 +00:00
parent fdb8f8a0de
commit 3341e94420
7 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
interpreters/ficl/Makefile
View File

@ -35,14 +35,11 @@
BUILDDIR := ${shell pwd | sed -e 's/ /\\ /g'} BUILDDIR := ${shell pwd | sed -e 's/ /\\ /g'}
-include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
# Tools # Tools
INCDIR = $(TOPDIR)/tools/incdir.sh
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
INCDIROPT = -w INCDIROPT = -w
endif endif

2
modbus/ascii/Make.defs
View File

@ -39,6 +39,6 @@ CSRCS += mbascii.c
DEPPATH += --dep-path ascii DEPPATH += --dep-path ascii
VPATH += :ascii VPATH += :ascii
CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/ascii} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/ascii}
endif endif

2
modbus/functions/Make.defs
View File

@ -38,4 +38,4 @@ CSRCS += mbfuncinput.c mbfuncother.c mbutils.c
DEPPATH += --dep-path functions DEPPATH += --dep-path functions
VPATH += :functions VPATH += :functions
CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/functions} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/functions}

2
modbus/nuttx/Make.defs
View File

@ -37,4 +37,4 @@ CSRCS += portevent.c portother.c portserial.c porttimer.c
DEPPATH += --dep-path nuttx DEPPATH += --dep-path nuttx
VPATH += :nuttx VPATH += :nuttx
CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/nuttx} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/nuttx}

2
modbus/rtu/Make.defs
View File

@ -39,6 +39,6 @@ CSRCS += mbcrc.c mbrtu.c
DEPPATH += --dep-path rtu DEPPATH += --dep-path rtu
VPATH += :rtu VPATH += :rtu
CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/rtu} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/rtu}
endif endif

2
modbus/tcp/Make.defs
View File

@ -39,6 +39,6 @@ CSRCS += mbtcp.c
DEPPATH += --dep-path tcp DEPPATH += --dep-path tcp
VPATH += :tcp VPATH += :tcp
CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/tcp} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/modbus/tcp}
endif endif

4
netutils/thttpd/cgi-src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/netutils/cgi-src/Makefile # 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> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -40,7 +40,7 @@ ifeq ($(WINTOOL),y)
INCDIROPT = -w INCDIROPT = -w
endif 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 CGIBINDIR = $(APPDIR)/netutils/thttpd/cgi-bin
CLEANFILES = *.o redirect ssi phf CLEANFILES = *.o redirect ssi phf