diff options
| author | 2015-01-13 11:50:42 +0100 | |
|---|---|---|
| committer | 2015-01-13 11:50:42 +0100 | |
| commit | 736cc5469da3e0e060dea6e44372c7798561c72d (patch) | |
| tree | f845f43359903b99611ae5d5c8c7ee41b11dbe0c /makefile | |
| parent | 937c5dfd46a675c9b59903fb8e46dde8c52bcdbd (diff) | |
Use $(INCPATH) only where needed
Diffstat (limited to 'makefile')
| -rw-r--r-- | makefile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 |
