From ae31f1568254c058f532c7165f534a6f17d07213 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Wed, 1 Jun 2022 13:39:23 +0000
Subject: [PATCH] - improved build system

git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@907 b431acfa-c32f-4a4a-93f1-934dc6c82436
---
 radio/processor/Makefile         | 25 +++++++++----------------
 radio/processor/config.mk        |  4 ++++
 radio/processor/src/Buffer.hpp   |  1 +
 radio/processor/src/Makefile     |  8 ++++++++
 radio/processor/src/config.mk    |  3 +++
 radio/processor/src/processor.mk |  6 ------
 radio/processor/test/Makefile    |  8 ++++++++
 radio/processor/test/config.mk   |  3 +++
 radio/processor/test/test.mk     |  6 ------
 9 files changed, 36 insertions(+), 28 deletions(-)
 create mode 100644 radio/processor/config.mk
 create mode 100644 radio/processor/src/Makefile
 create mode 100644 radio/processor/src/config.mk
 delete mode 100644 radio/processor/src/processor.mk
 create mode 100644 radio/processor/test/Makefile
 create mode 100644 radio/processor/test/config.mk
 delete mode 100644 radio/processor/test/test.mk

diff --git a/radio/processor/Makefile b/radio/processor/Makefile
index edb942e..cc06fe3 100644
--- a/radio/processor/Makefile
+++ b/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
diff --git a/radio/processor/config.mk b/radio/processor/config.mk
new file mode 100644
index 0000000..a513594
--- /dev/null
+++ b/radio/processor/config.mk
@@ -0,0 +1,4 @@
+MAKE_HOME := /home/jens/work/software/make
+CONFIG ?= debug
+TARGET ?= main
+BUILD_DIR ?= $(CURDIR)/build/${CONFIG}
diff --git a/radio/processor/src/Buffer.hpp b/radio/processor/src/Buffer.hpp
index 487cc0f..36e9ca5 100644
--- a/radio/processor/src/Buffer.hpp
+++ b/radio/processor/src/Buffer.hpp
@@ -12,6 +12,7 @@
 #define RETURN_OR_EXCEPT(code) return code
 #endif
 
+
 class IBuffer
 {
 	public:
diff --git a/radio/processor/src/Makefile b/radio/processor/src/Makefile
new file mode 100644
index 0000000..74b0ddd
--- /dev/null
+++ b/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
diff --git a/radio/processor/src/config.mk b/radio/processor/src/config.mk
new file mode 100644
index 0000000..311e9e4
--- /dev/null
+++ b/radio/processor/src/config.mk
@@ -0,0 +1,3 @@
+MAKE_HOME := /home/jens/work/software/make
+CONFIG ?= debug
+BUILD_DIR ?= $(CURDIR)/build/${CONFIG}/Hallo
diff --git a/radio/processor/src/processor.mk b/radio/processor/src/processor.mk
deleted file mode 100644
index da8669e..0000000
--- a/radio/processor/src/processor.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-
-PACKAGES += Processor-1.0
-
-CXX_SRCS += src/Block.cpp src/Processor.cpp
-DEFINES +=
-INCLUDES += -I $(shell pwd)/src
diff --git a/radio/processor/test/Makefile b/radio/processor/test/Makefile
new file mode 100644
index 0000000..53f51f7
--- /dev/null
+++ b/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
diff --git a/radio/processor/test/config.mk b/radio/processor/test/config.mk
new file mode 100644
index 0000000..4a5b78b
--- /dev/null
+++ b/radio/processor/test/config.mk
@@ -0,0 +1,3 @@
+MAKE_HOME := /home/jens/work/software/make
+CONFIG ?= debug
+BUILD_DIR ?= $(CURDIR)/build/${CONFIG}
diff --git a/radio/processor/test/test.mk b/radio/processor/test/test.mk
deleted file mode 100644
index 6f32e2c..0000000
--- a/radio/processor/test/test.mk
+++ /dev/null
@@ -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