janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-30 08:18:39 +01:00
Code Activity

make: Prefix BUILD_ to a couple of makefile variables

Browse source 
Rename variables to avoid collision:

  OBJ      -> BUILD_OBJ
  INCLUDE  -> BUILD_INCLUDE
  LIBFLAGS -> BUILD_LIBFLAGS
  LPPFLAGS -> BUILD_LPPFLAGS

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-04-08 18:26:45 +00:00
commit 17a080138c
8 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

22
make/qt-defs.mk
View file

@ -48,17 +48,17 @@ BUILD_CPPFLAGS += -DQT_THREAD_SUPPORT
#
#ifdef REENTRANT
# ifneq ($(QT_MAJOR_VERSION),4)
# LPPFLAGS += $(QT_LDFLAGS) -lqt-mt
# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lqt-mt
# else
# # LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
# LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
# # 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
# endif
#else
# ifneq ($(QT_MAJOR_VERSION),4)
# LPPFLAGS += $(QT_LDFLAGS) -lqt
# BUILD_LPPFLAGS += $(QT_LDFLAGS) -lqt
# else
# # LPPFLAGS += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
# LPPFLAGS += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
# # 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
# 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
LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
BUILD_LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
BUILD_INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
CXXFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
# ------------------------------- jw-build defs
@ -150,8 +150,8 @@ LOCAL_CXXFLAGS += -fPIC
endif
UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES))
OBJ += $(patsubst %.cpp,%.o,$(MOC_CPP))
OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP))
BUILD_OBJ += $(patsubst %.cpp,%.o,$(MOC_CPP))
BUILD_OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
BUILD_OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP))
endif # USE_QT