Update build system.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 21d6aaeb04c16b7db483d117e45ecb8a2c65f2c1..55310905727792aa816c2a700c1370518eb33f15 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,10 +35,12 @@ endif()
 #DISTRIBUTION\r
 set(CPACK_PACKAGE_VERSION_MAJOR "0")\r
 set(CPACK_PACKAGE_VERSION_MINOR "1")\r
-set(CPACK_PACKAGE_VERSION_PATCH "0")\r
+set(CPACK_PACKAGE_VERSION_PATCH "1")\r
 set(CPACK_SOURCE_GENERATOR "TBZ2")\r
 set(CPACK_SOURCE_PACKAGE_FILE_NAME\r
   "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")\r
+set(CPACK_SOURCE_IGNORE_FILES\r
+"/build")\r
 include(CPack)\r
 \r
 add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)\r

diff --git a/src/Makefile b/src/Makefile
index db7ba07394ed89b9cfeec09cda36bfeacd8d82dc..a08f7d7a553337505e53dcd1e3847bbeba1d1117 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,35 +2,35 @@
 all: generic bf518 cortex-m3 cortex-m4 generic\r
 \r
 bf518:\r
-       rm -R -f ../bf518\r
-       cd .. && mkdir bf518\r
-       cd ../bf518 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../src/toolchain/bf518.cmake ../src\r
-       cd ../bf518 && make\r
+       rm -R -f build_bf518\r
+       mkdir build_bf518\r
+       cd build_bf518 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../toolchain/bf518.cmake ..\r
+       cd build_bf518 && make\r
 \r
 cortex-m3:\r
-       rm -R -f ../cortex-m3\r
-       cd .. && mkdir cortex-m3\r
-       cd ../cortex-m3 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../src/toolchain/cortex-m3.cmake ../src\r
-       cd ../cortex-m3 && make\r
+       rm -R -f build_cortex-m3\r
+       mkdir build_cortex-m3\r
+       cd build_cortex-m3 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../toolchain/cortex-m3.cmake ..\r
+       cd build_cortex-m3 && make\r
 \r
 cortex-m4:\r
-       rm -R -f ../cortex-m4\r
-       cd .. && mkdir cortex-m4\r
-       cd ../cortex-m4 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../src/toolchain/cortex-m4.cmake ../src\r
-       cd ../cortex-m4 && make\r
+       rm -R -f build_cortex-m4\r
+       mkdir build_cortex-m4\r
+       cd build_cortex-m4 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../toolchain/cortex-m4.cmake ..\r
+       cd build_cortex-m4 && make\r
        \r
        \r
 generic:\r
-       rm -R -f ../generic\r
-       cd .. && mkdir generic\r
-       cd ../generic && cmake -G"Unix Makefiles" ../src\r
-       cd ../generic && make\r
+       rm -R -f build_generic\r
+       mkdir build_generic\r
+       cd build_generic && cmake -G"Unix Makefiles" ../\r
+       cd build_generic && make\r
        \r
        \r
 clean:\r
-       rm -R -f ../bf518\r
-       rm -R -f ../cortex-m3\r
-       rm -R -f ../cortex-m4\r
-       rm -R -f ../generic\r
+       rm -R -f build_bf518\r
+       rm -R -f build_cortex-m3\r
+       rm -R -f build_cortex-m4\r
+       rm -R -f build_generic\r
 \r
        
\ No newline at end of file