diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 9112c1a29..0e1faea9a 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -263,8 +263,9 @@ LDCMD = $(LD) -o $@ $^ #-------------------------------------------------- # Build compile line here -COMPILE.c = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(SOURCE_FLAG) -COMPILE.cpp = $(CCC) -c $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) $(SOURCE_CXXFLAG) +PATH_FILTER = $(1) +COMPILE.c = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG) +COMPILE.cpp = $(CCC) -c $(CPPFLAGS) $(CXXFLAGS) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_CXXFLAG) #-------------------------------------------------- # Build depends command here diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 10ad6b346..7c80df989 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -203,7 +203,7 @@ ifeq ($(HDEPENDS),YES) @$(HDEPENDS_TARGETS_CMD) $*$(DEP) endif @$(RM) $@ - $(COMPILE.c) $< + $(COMPILE.c) $(call PATH_FILTER,$<) %$(OBJ): %.cc ifeq ($(HDEPENDS),YES) @@ -212,7 +212,7 @@ ifeq ($(HDEPENDS),YES) @$(HDEPENDS_TARGETS_CMD) $*$(DEP) endif @$(RM) $@ - $(COMPILE.cpp) $< $(COMPILE_FILTER.cpp) + $(COMPILE.cpp) $(call PATH_FILTER,$<) $(COMPILE_FILTER.cpp) %$(OBJ): %.cpp ifeq ($(HDEPENDS),YES) @@ -221,7 +221,7 @@ ifeq ($(HDEPENDS),YES) @$(HDEPENDS_TARGETS_CMD) $*$(DEP) endif @$(RM) $@ - $(COMPILE.cpp) $< $(COMPILE_FILTER.cpp) + $(COMPILE.cpp) $(call PATH_FILTER,$<) $(COMPILE_FILTER.cpp) %$(OBJ): %.C ifeq ($(HDEPENDS),YES) @@ -230,7 +230,7 @@ ifeq ($(HDEPENDS),YES) @$(HDEPENDS_TARGETS_CMD) $*$(DEP) endif @$(RM) $@ - $(COMPILE.cpp) $< $(COMPILE_FILTER.cpp) + $(COMPILE.cpp) $(call PATH_FILTER,$<) $(COMPILE_FILTER.cpp) # WIN95/NT resource compiler %$(RES): %.rc