janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +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

6
make/swig.mk
View file

@ -32,7 +32,7 @@ ifeq ($(SWIG_TARGET),php)
INCLUDE += $(shell php-config --includes)
INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions
LOCAL_CFLAGS += -Wno-unused-label -Wno-unused-function
LOCAL_CPPFLAGS += -Wno-unused-label -Wno-unused-function
LOCAL_CXXFLAGS += -Wno-unused-label -Wno-unused-function
all:
@ -148,7 +148,7 @@ SWIG_INSTALLED_MODULE_TARGET = $(addprefix $(SWIG_MODULE_TARGET_DIR)/,$(SWIG_MOD
SWIG_DEFINES += -DNON_C_BINDING
SWIG_OPTS += $(SWIG_DEFINES)
LOCAL_CFLAGS += $(SWIG_DEFINES)
LOCAL_CPPFLAGS += $(SWIG_DEFINES)
LOCAL_CXXFLAGS += $(SWIG_DEFINES)
# for depend.mk
OBJ = $(SWIG_OBJ)
@ -168,7 +168,7 @@ $(SWIG_MODULE_WRAP_C): $(SWIG_INTERFACE_I)
$(SWIG_POSTPROCESS)
$(SWIG_MODULE_SO): $(SWIG_OBJ)
$(CPP) $^ -shared $(BUILD_LDFLAGS) -o $@
$(CXX) $^ -shared $(BUILD_LDFLAGS) -o $@
$(SWIG_MODULE_TARGET_DIR)/%: %
$(INSTALL) -p -o $(SWIG_TARGETOWNER) -g $(SWIG_TARGETGROUP) -m $(SWIG_TARGETMODE) $< $@