janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

make: Rename CFLAGS, CXXFLAGS and CPPFLAGS variables

Browse source 
Rename CFLAGS and friends to follow the conventions of the implicit rules
defined by GNU Make:

 - $(CPPFLAGS) is passed to both C++ and C compiler
 - $(CXXFLAGS) is passed to C++ compiler only
 - $(CFLAGS) is passed to C compiler only
 - C++ compiler is in $(CXX)

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-19 07:07:00 +00:00
commit 58ab619f0b
18 changed files with 71 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

19
make/rules.mk
View file

@ -181,11 +181,14 @@ echo-cflags:
@echo LOCAL_CFLAGS = $(LOCAL_CFLAGS)
@echo PROJECT_CFLAGS = $(PROJECT_CFLAGS)
@echo BUILD_CFLAGS = $(BUILD_CFLAGS)
@echo LOCAL_CXXFLAGS = $(LOCAL_CXXFLAGS)
@echo PROJECT_CXXFLAGS = $(PROJECT_CXXFLAGS)
@echo BUILD_CXXFLAGS = $(BUILD_CXXFLAGS)
@echo LOCAL_CPPFLAGS = $(LOCAL_CPPFLAGS)
@echo PROJECT_CPPFLAGS = $(PROJECT_CPPFLAGS)
@echo BUILD_CPPFLAGS = $(BUILD_CPPFLAGS)
@echo REAL_CFLAGS = $(REAL_CFLAGS)
@echo REAL_CPPFLAGS = $(REAL_CPPFLAGS)
@echo REAL_CXXFLAGS = $(REAL_CXXFLAGS)
echo-development:
echo DEVELOPMENT = $(DEVELOPMENT)
@ -313,19 +316,19 @@ $(MSVCPP_IMPLIB): $(LIB_SO)
endif
$(FLAVOUR_PREFIX)%.o: %.cpp
$(CPP) $(REAL_CPPFLAGS) -c $< -o $@
$(CXX) $(REAL_CXXFLAGS) $(REAL_CPPFLAGS) -c $< -o $@
$(FLAVOUR_PREFIX)%.o: %.cc
$(CPP) $(REAL_CPPFLAGS) -c $< -o $@
$(CXX) $(REAL_CXXFLAGS) $(REAL_CPPFLAGS) -c $< -o $@
$(FLAVOUR_PREFIX)%.o: %.c
$(CC) $(REAL_CFLAGS) -c $< -o $@
$(CC) $(REAL_CFLAGS) $(REAL_CPPFLAGS) -c $< -o $@
$(FLAVOUR_PREFIX)%.o: %.S
$(CC) $(REAL_CFLAGS) -c $< -o $@
$(CC) $(REAL_CFLAGS) $(REAL_CPPFLAGS) -c $< -o $@
$(FLAVOUR_PREFIX)%.o: %.sx
$(CC) $(REAL_CFLAGS) -c $< -o $@
$(CC) $(REAL_CFLAGS) $(REAL_CPPFLAGS) -c $< -o $@
$(LIB_A)(%.o): %.o
$(AR) crU $(LIB_A) $<
@ -351,10 +354,10 @@ else
endif
$(EXE) $(EXE_BIN):
$(CPP) $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@
$(CXX) $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@
$(PLUGIN) $(PLUGIN_LIB):
$(CPP) -shared $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@
$(CXX) -shared $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@
# mkdir -p $(BUILD_LIBDIR)
# $(BIN_INSTALL) -m 755 $@ $(BUILD_LIBDIR)