janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 13:47:39 +01:00
Code Activity

make: Replace BUILD_XXX make flag variables by FINAL_XXX

Browse source 
The following BUILD_XXX variables are renamed to their respective FINAL_XXX
counterparts, as that name is more expressive:

  BUILD_CFLAGS, BUILD_CPPFLAGS, BUILD_CXXFLAGS, BUILD_EXTRA_DEBUG_FLAGS,
  BUILD_INCLUDE, BUILD_LDFLAGS, BUILD_LIBFLAGS, BUILD_LPPFLAGS

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-24 12:58:53 +00:00
commit 3365aa3db6
18 changed files with 249 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

22
make/qt-defs.mk
View file

@ -1,7 +1,7 @@
ifeq ($(USE_QT),true)
USE_X = true
BUILD_CPPFLAGS += -DQT_THREAD_SUPPORT
FINAL_CPPFLAGS += -DQT_THREAD_SUPPORT
#ifeq ($(PKG_FORMAT),rpm)
#QT_VERSION ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt)
@ -48,17 +48,17 @@ BUILD_CPPFLAGS += -DQT_THREAD_SUPPORT
#
#ifdef REENTRANT
# ifneq ($(QT_MAJOR_VERSION),4)
# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lqt-mt
# FINAL_LPPFLAGS += $(QT_LDFLAGS) -lqt-mt
# else
# # BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
# # FINAL_LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
# FINAL_LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
# endif
#else
# ifneq ($(QT_MAJOR_VERSION),4)
# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lqt
# FINAL_LPPFLAGS += $(QT_LDFLAGS) -lqt
# else
# # BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
# # FINAL_LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
# FINAL_LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
# endif
#endif
@ -124,8 +124,8 @@ QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODU
MOC ?= $(QT_BIN_PREFIX)/moc
UIC ?= $(QT_BIN_PREFIX)/uic
RCC ?= $(QT_BIN_PREFIX)/rcc
BUILD_LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
BUILD_INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
FINAL_LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
FINAL_INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
CXXFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
# ------------------------------- jw-build defs
@ -145,8 +145,8 @@ ifeq ($(QT_MAJOR_VERSION),4)
UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES))
else
UIC_H += $(patsubst %.ui,%.h, $(UIFILES))
BUILD_CFLAGS += -fPIC
BUILD_CXXFLAGS += -fPIC
FINAL_CFLAGS += -fPIC
FINAL_CXXFLAGS += -fPIC
endif
UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES))