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

Now use libkchart for charts, delete old pieview and replace it

Browse Source
This commit is contained in:
Grégory Soutadé
2012-01-28 15:53:58 +01:00
parent a71638ace6
commit 973032f51c
5 changed files with 79 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Makefile
View File

@@ -5,7 +5,7 @@ DOC_DIR=$(DESTDIR)$(ROOT_DIR)"/share/doc/kisscount/"
BIN_DIR=$(DESTDIR)$(ROOT_DIR)"/bin/"
QT_PACKAGES="QtCore QtGui QtSql"
CXXFLAGS=`pkg-config --cflags $(QT_PACKAGES)` -Wall -Isrc -ggdb
CXXFLAGS=`pkg-config --cflags $(QT_PACKAGES)` -Wall -Isrc -ggdb -fPIC
CXXFLAGS+=-I/usr/include/libxml2
CXXFLAGS+=-DRESSOURCES_ROOT="\"$(SHARE_DIR)\""
# For developpers
@@ -23,13 +23,23 @@ MOC_HEADERS=$(shell find src/view -name '*.hpp' -type f | tr '\n' ' ')
MOCS=$(MOC_HEADERS:.hpp=.objs)
MOCS_OBJS=$(MOC_HEADERS:.hpp=.moc)
all: mojito kc
CXXFLAGS+=-Ilibkdchart/include -Ilibkdchart/src -Ilibkdchart/kdablibfakes/include
CXXFLAGS+=-DKDCHART_BUILD_KDCHART_LIB
KDCHART_SOURCES=$(shell find libkdchart/src -name '*.cpp' -type f | tr '\n' ' ')
KDCHART_OBJS=$(KDCHART_SOURCES:.cpp=.o)
UI_CHARTSELECTOR=libkdchart/src/ui_KDChartDatasetSelector.h
KDCHART_MOC_HEADERS=$(shell find libkdchart/src -name '*.h' -type f | tr '\n' ' ')
KDCHART_MOCS=$(KDCHART_MOC_HEADERS:.h=.objs)
KDCHART_MOCS_OBJS=$(KDCHART_MOC_HEADERS:.h=.moc)
LDFLAGS+=libkdchart.a
clean:
find src -type f -name '*.o' -exec rm -f \{\} \;
find src -type f -name '*~' -exec rm -f \{\} \;
find src -type f -name '*.moc' -exec rm -f \{\} \;
find src -type f -name '*.objs' -exec rm -f \{\} \;
all: mojito libkdchart.a kc
clean: clean_libkdchart
find src -type f -name '*.o' -delete
find src -type f -name '*~' -delete
find src -type f -name '*.moc' -delete
find src -type f -name '*.objs' -delete
rm -f kc
%.o : %.cpp
@@ -41,11 +51,26 @@ clean:
%.moc : %.hpp
moc -nw $< -o $@
mojito : $(MOCS_OBJS)
%.moc : %.h
moc -nw $< -o $@
mojito : $(MOCS_OBJS) $(KDCHART_MOCS_OBJS)
kc: $(MOCS) $(OBJS)
$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) #-L. -lkdchart
$(UI_CHARTSELECTOR): libkdchart/src/KDChartDatasetSelector.ui
uic $< > $(UI_CHARTSELECTOR)
sed s/KDCHARTDATASETSELECTOR_H/UI_KDCHARTDATASETSELECTOR_H/g -i $(UI_CHARTSELECTOR)
libkdchart.a: $(UI_CHARTSELECTOR) $(KDCHART_MOCS) $(KDCHART_OBJS)
ar rcu libkdchart.a $(KDCHART_MOCS) $(KDCHART_OBJS)
clean_libkdchart:
rm -rf libkdchart.a
find libkdchart -name '*.o' -delete
find libkdchart -type f -name '*.moc' -delete
find libkdchart -type f -name '*.objs' -delete
generate_locales:
./tools/generate_locales.sh