Using new build system

Makefile

@@ -18,43 +18,19 @@ all-win32: gui-win32
 aot: ./deps/aot/Source/LemmatizerLib/libLemmatizerrst.a
 aot-win32: ./deps/aot/Source/LemmatizerLib/libLemmatizermrst.a
 
-###############################################################################
 # Core
-###############################################################################
-
-./core/build/Makefile:
-	cd core && ./configure-linux.sh
-
-./core/build-win32/Makefile:
-	cd core && ./configure-win32.sh
-
-./core/build/liblspl.so: aot ./core/build/Makefile
-	make -C core/build
-
-./core/build-win32/lspl.dll: aot-win32 ./core/build-win32/Makefile
-	make -C core/build-win32
-
-core: ./core/build/liblspl.so
-core-win32: ./core/build-win32/lspl.dll
-
-###############################################################################
-# Java
-###############################################################################
-
-./bindings-java/build/Makefile:
-	cd bindings-java && ./configure-linux.sh
-
-./bindings-java/build-win32/Makefile:
-	cd bindings-java && ./configure-win32.sh
 
-./bindings-java/build/liblspl-java.so: ./core/build/liblspl.so ./bindings-java/build/Makefile
-	make -C bindings-java/build
+core: aot
+	make -C core linux64
+core-win32: aot-win32
+	make -C core win32
 
-./bindings-java/build-win32/lspl-java.dll: ./core/build-win32/lspl.dll ./bindings-java/build-win32/Makefile
-	make -C bindings-java/build-win32
+# Java bindings
 
-java: ./bindings-java/build/liblspl-java.so
-java-win32: ./bindings-java/build-win32/lspl-java.dll
+java: core
+	make -C bindings-java linux64
+java-win32: core-win32
+	make -C bindings-java win32
 
 ###############################################################################
 # Tools

bindings-java/Makefile

@@ -0,0 +1 @@
+include ../common/common.make

common/common.make

@@ -0,0 +1,29 @@
+# Linux64
+
+linux64: ./build-linux64/Makefile
+	make -C build-linux64
+
+clean-linux64: ./build-linux64/Makefile
+	make -C build-linux64 clean
+
+distclean-linux64:
+	rm -r build-linux64
+
+# Win32
+
+win32: ./build-win32/Makefile
+	make -C build-win32
+
+clean-win32: ./build-win32/Makefile
+	make -C build-win32 clean
+
+distclean-win32:
+	rm -r build-win32
+
+# Configuration rules
+
+./build-linux64/Makefile:
+	mkdir -p build-linux64 && cd build-linux64 && cmake -DCMAKE_SYSTEM_NAME=Linux .. -DCMAKE_BUILD_TYPE=Release ..
+
+./build-win32/Makefile:
+	mkdir -p build-win32 && cd build-win32 && cmake -DCMAKE_TOOLCHAIN_FILE=../common/Toolchain-mingw32.cmake -DCMAKE_BUILD_TYPE=Release ..

core/Makefile

@@ -0,0 +1,7 @@
+include ../common/common.make
+
+doxygen:
+	doxygen LsplCore.doxyfile
+
+upload-doxygen: doyxgen
+	cd doc && scp -r html/* [email protected]:/home/lspl/data/www/static.lspl.ru/doc-core

tools/Makefile

@@ -0,0 +1 @@
+include ../common/common.make