soutade/KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

Clean Makefile (remove old libkdchart references)

Browse Source
This commit is contained in:
Grégory Soutadé
2019-07-27 13:58:32 +02:00
parent 473725bd18
commit 2865102a55
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@@ -11,14 +11,10 @@ KISSCOUNT=kc
QT_PACKAGES="Qt5Core Qt5Gui Qt5Sql Qt5Xml Qt5Widgets" QT_PACKAGES="Qt5Core Qt5Gui Qt5Sql Qt5Xml Qt5Widgets"
CXXFLAGS+=`pkg-config --cflags $(QT_PACKAGES)` CXXFLAGS+=`pkg-config --cflags $(QT_PACKAGES)`
CXXFLAGS+=-Wall -Isrc -Isrc/win32 -I${PWD}/lib/qt5charts/usr/include/x86_64-linux-gnu/qt5/ -L${PWD}/lib/qtcharts/lib/ -L${PWD}/lib/qt5charts/usr/lib/x86_64-linux-gnu/ CXXFLAGS+=-Wall -Isrc -Isrc/win32 -I${PWD}/lib/qt5charts/usr/include/x86_64-linux-gnu/qt5/ -L${PWD}/lib/qtcharts/lib/ -L${PWD}/lib/qt5charts/usr/lib/x86_64-linux-gnu/
CXXFLAGS+=-Wall
#-Dnullptr=0
ifdef WIN32 ifdef WIN32
CXXFLAGS+=-DRESOURCES_ROOT="\"./resources/\"" -static CXXFLAGS+=-DRESOURCES_ROOT="\"./resources/\"" -static
else else
CXXFLAGS+=-DRESOURCES_ROOT="\"$(SHARE_DIR)\"" -ggdb -fPIC -O0 CXXFLAGS+=-DRESOURCES_ROOT="\"$(SHARE_DIR)\"" -ggdb -fPIC -O0
# For developpers
#CXXFLAGS+=-DRESOURCES_ROOT="\"./resources/\""
endif endif
SOURCES=$(shell find src -name '*.cpp' -type f | tr '\n' ' ') SOURCES=$(shell find src -name '*.cpp' -type f | tr '\n' ' ')
@@ -27,16 +23,6 @@ MOC_HEADERS=$(shell find src/view -name '*.hpp' -type f | tr '\n' ' ')
MOCS=$(MOC_HEADERS:.hpp=.objs) MOCS=$(MOC_HEADERS:.hpp=.objs)
MOCS_OBJS=$(MOC_HEADERS:.hpp=.moc) MOCS_OBJS=$(MOC_HEADERS:.hpp=.moc)
#CXXFLAGS+=-Ilib/libkdchart/include -Ilib/libkdchart/src -Ilib/libkdchart/kdablibfakes/include
#CXXFLAGS+=-DKDCHART_BUILD_KDCHART_LIB
#KDCHART_SOURCES=$(shell find lib/libkdchart/src -name '*.cpp' -type f | tr '\n' ' ')
#KDCHART_OBJS=$(KDCHART_SOURCES:.cpp=.o)
#UI_CHARTSELECTOR=lib/libkdchart/src/ui_KDChartDatasetSelector.h
#KDCHART_MOC_HEADERS=$(shell find lib/libkdchart/src -name '*.h' -type f | tr '\n' ' ')
#KDCHART_MOCS=$(KDCHART_MOC_HEADERS:.h=.objs)
#KDCHART_MOCS_OBJS=$(KDCHART_MOC_HEADERS:.h=.moc)
#LDFLAGS+=lib/libkdchart.a
ifndef WIN32 ifndef WIN32
LDFLAGS+=`pkg-config --libs $(QT_PACKAGES)` LDFLAGS+=`pkg-config --libs $(QT_PACKAGES)`
LDFLAGS+=-lofx -lQt5Charts LDFLAGS+=-lofx -lQt5Charts
@@ -72,13 +58,6 @@ mojito : $(MOCS_OBJS)
$(KISSCOUNT): $(MOCS) $(OBJS) $(KISSCOUNT): $(MOCS) $(OBJS)
$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
# $(UI_CHARTSELECTOR): lib/libkdchart/src/KDChartDatasetSelector.ui
# uic $< > $(UI_CHARTSELECTOR)
# sed s/KDCHARTDATASETSELECTOR_H/UI_KDCHARTDATASETSELECTOR_H/g -i $(UI_CHARTSELECTOR)
# lib/libkdchart.a: $(UI_CHARTSELECTOR) $(KDCHART_MOCS) $(KDCHART_OBJS)
# $(HOST)ar rcu lib/libkdchart.a $(KDCHART_MOCS) $(KDCHART_OBJS)
clean_libkdchart: clean_libkdchart:
rm -rf lib/libkdchart.a rm -rf lib/libkdchart.a
find lib/libkdchart -name '*.o' -delete find lib/libkdchart -name '*.o' -delete

4
tools/package.sh
View File

@@ -29,6 +29,8 @@ rm -rf "$DIR"
# Debian packaging # Debian packaging
if [ -d "debian" ] ; then if [ -d "debian" ] ; then
[ "${ARCH}" == "x86_64" ] && ARCH="amd64"
[ "${ARCH}" == "i686" ] && ARCH="i386"
DEB_FILE="kisscount_${VERSION}-1_${ARCH}.deb" DEB_FILE="kisscount_${VERSION}-1_${ARCH}.deb"
rm -rf "$DEB_DIR" "$DEB_FILE" rm -rf "$DEB_DIR" "$DEB_FILE"
mkdir "$DEB_DIR" mkdir "$DEB_DIR"
@@ -42,8 +44,6 @@ mv debian/Makefile .
[ ! -d lib ] && ln -s ../lib [ ! -d lib ] && ln -s ../lib
#sed -i s/i686/$ARCH/g debian/control #sed -i s/i686/$ARCH/g debian/control
#dh_make -f "../$DEB_FILE" --copyright gpl3 --email $DEBEMAIL -s #dh_make -f "../$DEB_FILE" --copyright gpl3 --email $DEBEMAIL -s
[ "${ARCH}" == "x86_64" ] && ARCH="amd64"
[ "${ARCH}" == "i686" ] && ARCH="i386"
debuild -us -uc -b -i -a${ARCH} || (cd - ; exit 1) debuild -us -uc -b -i -a${ARCH} || (cd - ; exit 1)
cd - cd -
rm -rf "$DEB_DIR" "$DEB_FILE".changes "$DEB_FILE".build rm -rf "$DEB_DIR" "$DEB_FILE".changes "$DEB_FILE".build