* Makefile.common: Perform more include file testing trickery.
This commit is contained in:
parent
c5e7ccacff
commit
0055a6c6c9
|
@ -1,3 +1,7 @@
|
||||||
|
2001-10-12 Christopher Faylor <cgf@redhat.com>
|
||||||
|
|
||||||
|
* Makefile.common: Perform more include file testing trickery.
|
||||||
|
|
||||||
Sun Oct 7 23:08:46 2001 Christopher Faylor <cgf@cygnus.com>
|
Sun Oct 7 23:08:46 2001 Christopher Faylor <cgf@cygnus.com>
|
||||||
|
|
||||||
* Makefile.common: Avoid adding -I options to compile if they already
|
* Makefile.common: Avoid adding -I options to compile if they already
|
||||||
|
|
|
@ -66,16 +66,20 @@ mingw_build:=$(bupdir)/mingw
|
||||||
mingw_source:=$(updir)/mingw
|
mingw_source:=$(updir)/mingw
|
||||||
utils_build:=$(bupdir)/utils
|
utils_build:=$(bupdir)/utils
|
||||||
utils_source:=$(updir)/utils
|
utils_source:=$(updir)/utils
|
||||||
ifeq (,${findstring $(newlib_source),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
|
ifeq (,${findstring $(newlib_source)/libc/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
|
||||||
newlib_include:=-I$(newlib_source)/libc/include
|
newlib_include:=-I$(newlib_source)/libc/include
|
||||||
newlib_sys_include:=-I$(newlib_source)/libc/sys
|
endif
|
||||||
|
ifeq (,${findstring $(newlib_source)/libc/sys/cygwin,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
|
||||||
|
newlib_sys_include:=-I$(newlib_source)/libc/sys/cygwin
|
||||||
|
endif
|
||||||
|
ifeq (,${findstring $(newlib_source)/libc/sys/cygwin/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
|
||||||
|
newlib_sys_include_include:=-I$(newlib_source)/libc/sys/cygwin/include
|
||||||
endif
|
endif
|
||||||
ifeq (,${findstring $(cygwin_source)/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
|
ifeq (,${findstring $(cygwin_source)/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
|
||||||
cygwin_include:=-I$(cygwin_source)/include
|
cygwin_include:=-I$(cygwin_source)/include
|
||||||
endif
|
endif
|
||||||
cygwin_include:=-I$(cygwin_source)/include
|
|
||||||
|
|
||||||
INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_sys_include) $(newlib_include) $(w32api_include)
|
INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_sys_include) $(newlib_include) $(newlib_sys_include_include) $(w32api_include)
|
||||||
ifdef CONFIG_DIR
|
ifdef CONFIG_DIR
|
||||||
INCLUDES+=-I$(CONFIG_DIR)
|
INCLUDES+=-I$(CONFIG_DIR)
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue