janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 23:13:54 +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/qt-defs.mk
View file

@ -1,7 +1,7 @@
ifeq ($(USE_QT),true)
USE_X = true
CPPFLAGS += -DQT_THREAD_SUPPORT
BUILD_CPPFLAGS += -DQT_THREAD_SUPPORT
#ifeq ($(PKG_FORMAT),rpm)
#QT_VERSION ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt)
@ -126,7 +126,7 @@ UIC ?= $(QT_BIN_PREFIX)/uic
RCC ?= $(QT_BIN_PREFIX)/rcc
LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
CXXFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
# ------------------------------- jw-build defs
@ -146,7 +146,7 @@ UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES))
else
UIC_H += $(patsubst %.ui,%.h, $(UIFILES))
LOCAL_CFLAGS += -fPIC
LOCAL_CPPFLAGS += -fPIC
LOCAL_CXXFLAGS += -fPIC
endif
UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES))