summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-01-13 11:50:42 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-01-13 11:50:42 +0100
commit736cc5469da3e0e060dea6e44372c7798561c72d (patch)
treef845f43359903b99611ae5d5c8c7ee41b11dbe0c /makefile
parent937c5dfd46a675c9b59903fb8e46dde8c52bcdbd (diff)
Use $(INCPATH) only where needed
Diffstat (limited to 'makefile')
-rw-r--r--makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/makefile b/makefile
index a8b440a6739..0f82b74bb23 100644
--- a/makefile
+++ b/makefile
@@ -509,7 +509,7 @@ CPPONLYFLAGS =
# CFLAGS is defined based on C or C++ targets
# (remember, expansion only happens when used, so doing it here is ok)
-CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
+CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) $(INCPATH)
# we compile C-only to C89 standard with GNU extensions
# we compile C++ code to C++98 standard with GNU extensions
@@ -864,7 +864,6 @@ include $(SRC)/tools/tools.mak
include $(SRC)/regtests/regtests.mak
# combine the various definitions to one
-CCOMFLAGS += $(INCPATH)
CDEFS = $(DEFS)
# TODO: -x c++ should not be hard-coded
@@ -1020,7 +1019,7 @@ $(OBJ)/%.a:
ifeq ($(TARGETOS),macosx)
$(OBJ)/%.o: $(SRC)/%.m | $(OSPREBUILD)
@echo Objective-C compiling $<...
- $(CC) $(CDEFS) $(COBJFLAGS) $(CCOMFLAGS) -c $< -o $@
+ $(CC) $(CDEFS) $(COBJFLAGS) $(CCOMFLAGS) $(INCPATH) -c $< -o $@
endif