Merge with dev

Makefile

@@ -1,51 +1,84 @@
-ROOT_DIR="/usr/local"
+ROOT_DIR="/usr"
 LIB_DIR=$(DESTDIR)$(ROOT_DIR)"/lib/kisscount/"
 SHARE_DIR=$(DESTDIR)$(ROOT_DIR)"/share/kisscount/"
 DOC_DIR=$(DESTDIR)$(ROOT_DIR)"/share/doc/kisscount/"
 BIN_DIR=$(DESTDIR)$(ROOT_DIR)"/bin/"
 
-CXXFLAGS+=`wx-config --cxxflags` -Wall -Isrc -ggdb
-CXXFLAGS+=-I./lib/wxsqlite3-1.9.9/include
-CXXFLAGS+=-I./lib/freechart/include
-CXXFLAGS+=-I/usr/include/libxml2
-CXXFLAGS+=-Wl,--rpath,"$(LIB_DIR)"
+QT_PACKAGES="QtCore QtGui QtSql QtXml"
+CXXFLAGS+=`pkg-config --cflags $(QT_PACKAGES)`
+CXXFLAGS+=-Wall -Isrc -Isrc/win32 -ggdb -fPIC
+ifdef WIN32
+CXXFLAGS+=-DRESSOURCES_ROOT="\"./ressources/\""
+else
 CXXFLAGS+=-DRESSOURCES_ROOT="\"$(SHARE_DIR)\""
 # For developpers
 #CXXFLAGS+=-DRESSOURCES_ROOT="\"./ressources/\""
+endif
 
-LDFLAGS+=`wx-config --libs`
+LDFLAGS+=`pkg-config --libs $(QT_PACKAGES)`
+ifndef WIN32
 LDFLAGS+=-lofx
-LDFLAGS+=-lxml2
-
-ifdef WIN32
-LDFLAGS+=-L./lib/wxsqlite3-1.9.9/lib/ -lwxcode_msw_wxsqlite3-2.8
-LDFLAGS+=-L./lib/freechart/lib -lwxcode_msw_freechart-2.8
-else
-LDFLAGS+=-L./lib/wxsqlite3-1.9.9/lib/ -lwxcode_gtk2u_wxsqlite3-2.8
-LDFLAGS+=-L./lib/freechart/lib -lwxcode_gtk2u_freechart-2.8
 endif
 
 CXX=$(HOST)g++
 
 SOURCES=$(shell find src -name '*.cpp' -type f | tr '\n' ' ')
-HEADERS=$(shell find src -name '*.h' -type f)
 OBJS=$(SOURCES:.cpp=.o)
+MOC_HEADERS=$(shell find src/view -name '*.hpp' -type f | tr '\n' ' ')
+MOCS=$(MOC_HEADERS:.hpp=.objs)
+MOCS_OBJS=$(MOC_HEADERS:.hpp=.moc)
 
-all: check kc
+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
 
-clean:
-	find src -type f -name '*.[o~]' -exec rm -f \{\} \;
+all: mojito lib/libkdchart.a kc
+
+clean_all: clean clean_libkdchart
+
+clean: 
+	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 : src/model/%.cpp src/model/import/%.cpp src/model/export/%.cpp src/view/%.cpp src/view/grid/%.cpp src/controller/%.cpp src/%.cpp
-	$(CXX) $(CXXFLAGS) -c $<
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-check:
-	if ! test -d lib ; then echo lib directory not found, please see INSTALL ; return 1 ; fi
+%.objs : %.moc
+	$(CXX) $(CXXFLAGS) -x c++ $< -c -o $@
 
-kc: $(OBJS)
+%.moc : %.hpp
+	moc -nw $< -o $@
+
+%.moc : %.h
+	moc -nw $< -o $@
+
+mojito : $(MOCS_OBJS) $(KDCHART_MOCS_OBJS)
+
+kc: $(MOCS) $(OBJS)
 	$(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:
+	rm -rf lib/libkdchart.a
+	find lib/libkdchart -name '*.o' -delete
+	find lib/libkdchart -type f -name '*.moc' -delete
+	find lib/libkdchart -type f -name '*.objs' -delete
+
 generate_locales:
 	./tools/generate_locales.sh
 
@@ -58,11 +91,14 @@ package:
 endif
 
 install:
-	mkdir -p $(LIB_DIR) $(BIN_DIR) $(SHARE_DIR) $(DOC_DIR)
+	mkdir -p $(BIN_DIR) $(SHARE_DIR) $(DOC_DIR)
 	cp kc $(BIN_DIR)
-	find lib -name '*.so*' -exec cp -rf \{\} $(LIB_DIR) \;
 	cp -rf ressources/* $(SHARE_DIR)
-	cp -rf README* ChangeLog CONTRIBUTORS COPYING TODO $(DOC_DIR)
+	rm -rf $(SHARE_DIR)/ressources/po/*
+	cp -rf ressources/po/*.qm $(SHARE_DIR)/ressources/po/
+	cp -rf README* ChangeLog AUTHORS COPYING TODO $(DOC_DIR)
 
 remove:
 	rm -rf $(LIB_DIR) $(SHARE_DIR) $(DOC_DIR) $(BIN_DIR)/kc
+
+uninstall: remove