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

conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 18:12:28 +00:00
commit 0eaef0c326
59 changed files with 2065 additions and 2032 deletions
Download patch file Download diff file Expand all files Collapse all files

64
make/qt-defs.mk
View file

@ -1,14 +1,14 @@
ifeq ($(USE_QT),true)
USE_X = true
CPPFLAGS += -DQT_THREAD_SUPPORT
USE_X = true
CPPFLAGS += -DQT_THREAD_SUPPORT
#ifeq ($(PKG_FORMAT),rpm)
#QT_VERSION ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt)
#QT_VERSION ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt)
#else
#QT_VERSION = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//')
#QT_VERSION = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//')
#endif
#QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
#QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
#
#ifeq ($(QT_MAJOR_VERSION),2)
# QT_PREFIX ?= $(SYSTEM_LIBDIR)/qt2
@ -42,9 +42,9 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
# endif
#endif
#
#MOC ?= $(QT_PREFIX)/bin/moc
#UIC ?= $(QT_PREFIX)/bin/uic
#RCC ?= $(QT_PREFIX)/bin/rcc
#MOC ?= $(QT_PREFIX)/bin/moc
#UIC ?= $(QT_PREFIX)/bin/uic
#RCC ?= $(QT_PREFIX)/bin/rcc
#
#ifdef REENTRANT
# ifneq ($(QT_MAJOR_VERSION),4)
@ -67,7 +67,7 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
#Qt5Designer \
ifeq ($(QT_MAJOR_VERSION),5)
QT_MODULES ?= \
QT_MODULES ?= \
Qt5Concurrent \
Qt5Core \
Qt5DBus \
@ -95,7 +95,7 @@ QT_MODULES ?= \
Qt5XmlPatterns \
Qt5Xml
else
QT_MODULES ?= \
QT_MODULES ?= \
Qt3Support \
QtCLucene \
QtCore \
@ -120,39 +120,39 @@ QT_MODULES ?= \
endif
QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODULES))
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))
CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
QT_BIN_PREFIX ?= $(shell pkg-config --variable=host_bins $(QT_MODULES))
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))
CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
# ------------------------------- jw-build defs
UIFILES += $(wildcard *.ui)
RCCFILES += $(wildcard *.qrc)
UIFILES += $(wildcard *.ui)
RCCFILES += $(wildcard *.qrc)
ifneq ($(wildcard *.h),)
MOC_H_HC += $(shell grep -l Q_OBJECT $(wildcard *.h))
MOC_H_HC += $(shell grep -l Q_OBJECT $(wildcard *.h))
endif
MOC_H_UI += $(patsubst %.ui,ui_%.h,$(UIFILES))
MOC_H += $(sort $(MOC_H_HC) $(MOC_H_UI))
MOC_CPP += $(patsubst %.h,moc_%.cpp,$(notdir $(MOC_H_HC)))
MOC_H_UI += $(patsubst %.ui,ui_%.h,$(UIFILES))
MOC_H += $(sort $(MOC_H_HC) $(MOC_H_UI))
MOC_CPP += $(patsubst %.h,moc_%.cpp,$(notdir $(MOC_H_HC)))
# $(patsubst %.ui,moc_%.cpp,$(UIFILES)) \
RCC_CPP += $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES))
RCC_CPP += $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES))
ifeq ($(QT_MAJOR_VERSION),4)
UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES))
UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES))
else
UIC_H += $(patsubst %.ui,%.h, $(UIFILES))
LOCAL_CFLAGS += -fPIC
LOCAL_CPPFLAGS += -fPIC
UIC_H += $(patsubst %.ui,%.h, $(UIFILES))
LOCAL_CFLAGS += -fPIC
LOCAL_CPPFLAGS += -fPIC
endif
UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES))
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))
OBJ += $(patsubst %.cpp,%.o,$(MOC_CPP))
OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP))
endif # USE_QT