- improved build system

git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@907 b431acfa-c32f-4a4a-93f1-934dc6c82436

radio/processor/Makefile

@@ -1,25 +1,18 @@
-MAKE_HOME := /home/jens/work/software/make
-
-CONFIG ?= debug
-TARGET ?= main
-BUILD_DIR := ./build/${CONFIG}
-
-include ./src/processor.mk
-include ./test/test.mk
+include ./config.mk
 
 CXXFLAGS += -std=c++11
 LIBS := -lstdc++ -lm -larmadillo
 DEFINES += -DPROCESSOR_BUFFER_USE_EXCEPTIONS
 
-.PHONY: clean
-all: ${BUILD_DIR}/${TARGET}
+all: app 
 
-clean:
-	rm -rf ${BUILD_DIR}/*
-
-distclean:
-	rm -rf ${BUILD_DIR}
+app: pkg link
 
+pkg: 
+	make -C src BUILD_DIR=$(BUILD_DIR)/src
+	make -C test BUILD_DIR=$(BUILD_DIR)/test
+	
+run: app
+	${BUILD_DIR}/${TARGET}
 
 include $(MAKE_HOME)/compile.mk
-include $(MAKE_HOME)/link.mk

radio/processor/config.mk

@@ -0,0 +1,4 @@
+MAKE_HOME := /home/jens/work/software/make
+CONFIG ?= debug
+TARGET ?= main
+BUILD_DIR ?= $(CURDIR)/build/${CONFIG}

radio/processor/src/Buffer.hpp

@@ -12,6 +12,7 @@
 #define RETURN_OR_EXCEPT(code) return code
 #endif
 
+
 class IBuffer
 {
 	public:

radio/processor/src/Makefile

@@ -0,0 +1,8 @@
+include ./config.mk
+
+NAME := Processor-1.0
+
+CXX_SRCS += Block.cpp Processor.cpp
+INCLUDES += -I $(CURDIR)
+
+include $(MAKE_HOME)/compile.mk

radio/processor/src/config.mk

@@ -0,0 +1,3 @@
+MAKE_HOME := /home/jens/work/software/make
+CONFIG ?= debug
+BUILD_DIR ?= $(CURDIR)/build/${CONFIG}/Hallo

radio/processor/src/processor.mk

@@ -1,6 +0,0 @@
-
-PACKAGES += Processor-1.0
-
-CXX_SRCS += src/Block.cpp src/Processor.cpp
-DEFINES +=
-INCLUDES += -I $(shell pwd)/src

radio/processor/test/Makefile

@@ -0,0 +1,8 @@
+include ./config.mk
+
+NAME := Test-1.0
+CXX_SRCS += main.cpp test01.cpp test02.cpp TestBlock.cpp NullSource.cpp NullSink.cpp
+DEFINES +=
+INCLUDES += -I $(CURDIR) -I ../src
+
+include $(MAKE_HOME)/compile.mk

radio/processor/test/config.mk

@@ -0,0 +1,3 @@
+MAKE_HOME := /home/jens/work/software/make
+CONFIG ?= debug
+BUILD_DIR ?= $(CURDIR)/build/${CONFIG}

radio/processor/test/test.mk

@@ -1,6 +0,0 @@
-
-PACKAGES += Test-1.0
-
-CXX_SRCS += test/main.cpp test/test01.cpp test/test02.cpp test/TestBlock.cpp test/NullSource.cpp test/NullSink.cpp
-DEFINES +=
-INCLUDES += -I $(shell pwd)/test