modify some Makefile

Espressif Systems · Espressif Systems · commit 81cacc6aad58 · 2014-12-26T10:25:39.000+08:00
diff --git a/Makefile b/Makefile
@@ -169,8 +169,8 @@ $(foreach image,$(GEN_IMAGES),$(eval $(call MakeImage,$(basename $(image)))))
 # Required for each makefile to inherit from the parent
 #
 
-INCLUDES := $(INCLUDES) -I $(PDIR)include -I $(PDIR)include/$(TARGET)
-INCLUDES += -I ./ -I $(PDIR)include/lwip -I $(PDIR)include/lwip/ipv4 -I $(PDIR)include/lwip/ipv6
+INCLUDES := $(INCLUDES) -I $(PDIR)include -I $(PDIR)extra_include
+INCLUDES += -I $(PDIR)include/lwip -I $(PDIR)include/lwip/ipv4 -I $(PDIR)include/lwip/ipv6
 INCLUDES += -I $(PDIR)include/espressif
 PDIR := ../$(PDIR)
 sinclude $(PDIR)Makefile
diff --git a/app/Makefile b/app/Makefile
@@ -97,8 +97,7 @@ DEPENDS_eagle.app.v6 = \
 #	-DTXRX_TXBUF_DEBUG
 #	-DTXRX_RXBUF_DEBUG
 #	-DWLAN_CONFIG_CCX
-CONFIGURATION_DEFINES =	-D__ets__ \
-			-DICACHE_FLASH
+CONFIGURATION_DEFINES =	-DICACHE_FLASH
 
 DEFINES +=				\
 	$(UNIVERSAL_TARGET_DEFINES)	\
@@ -122,7 +121,6 @@ DDEFINES +=				\
 #
 
 INCLUDES := $(INCLUDES) -I $(PDIR)include
-INCLUDES += -I ./
 PDIR := ../$(PDIR)
 sinclude $(PDIR)Makefile
 
diff --git a/app/user/Makefile b/app/user/Makefile
@@ -38,8 +38,6 @@ endif
 #
 
 INCLUDES := $(INCLUDES) -I $(PDIR)include
-INCLUDES += -I ./
-INCLUDES += -I ../../include/ets
 PDIR := ../$(PDIR)
 sinclude $(PDIR)Makefile
 
diff --git a/examples/driver_lib/driver/Makefile b/examples/driver_lib/driver/Makefile
@@ -38,7 +38,6 @@ endif
 #
 
 INCLUDES := $(INCLUDES) -I $(PDIR)include
-INCLUDES += -I ./
 PDIR := ../$(PDIR)
 sinclude $(PDIR)Makefile
 

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ endif`
`38`	`38`	`#`
`39`	`39`
`40`	`40`	`INCLUDES := $(INCLUDES) -I $(PDIR)include`
`41`		`-INCLUDES += -I ./`
`42`		`-INCLUDES += -I ../../include/ets`
`43`	`41`	`PDIR := ../$(PDIR)`
`44`	`42`	`sinclude $(PDIR)Makefile`
`45`	`43`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ endif`
`38`	`38`	`#`
`39`	`39`
`40`	`40`	`INCLUDES := $(INCLUDES) -I $(PDIR)include`
`41`		`-INCLUDES += -I ./`
`42`	`41`	`PDIR := ../$(PDIR)`
`43`	`42`	`sinclude $(PDIR)Makefile`
`44`	`43`