Build: update for the new build system still residing in libdaisy

Makefile

@@ -1,15 +1,15 @@
-.PHONY: all lib example flash clean clean-lib clean-examples
+.PHONY: all lib examples flash clean clean-lib clean-examples
 
 all: flash
 
-lib:
+flash: examples
-	$(MAKE) -C src lib
+	$(MAKE) -C examples program
 
-example: lib
+examples: lib
-	$(MAKE) -C examples
+	$(MAKE) -C examples all
 
-flash: example
+lib:
-	$(MAKE) -C examples program
+	$(MAKE) -C src all
 
 clean: clean-lib clean-examples
 

Makefile.conf

@@ -1,7 +1,8 @@
-HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
+#HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
--include $(HERE)build.conf
+-include build.conf
 
-TARGET_LIB ?= libdizzy
+TARGET_LIB = libdizzy.a
+FLASH_TARGET ?= main_testtone
 DEBUG ?= 0
 
 LIBDAISY_DIR ?= ../../heck_libDaisy
@@ -11,4 +12,5 @@ CXX_STANDARD ?= -std=c++17
 CXXFLAGS += -Wall -Wno-unused -Wno-reorder-ctor -Wno-switch
 CXXFLAGS += -fdiagnostics-color=always
 
-LDFLAGS += -u_printf_float
+#APP_TYPE ?= BOOT_NONE
+#LDFLAGS += -u_printf_float

examples/Makefile

@@ -1,18 +1,21 @@
 HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
--include $(HERE)../Makefile.conf
+include $(HERE)../Makefile.conf
 
-TARGET ?= main_blink
+# do not create a static lib
+TARGET_LIB =
 DEBUG ?= 0
 
 LIBDIZZY_DIR ?= ../src/
 CXXFLAGS += -I$(LIBDIZZY_DIR)
-LDFLAGS += -L$(LIBDIZZY_DIR)build/
+LDFLAGS += -L$(LIBDIZZY_DIR)
 LDFLAGS += -ldizzy
 
-ALL_SRC = $(wildcard *.cc)
+SRC_EXCLUDED := \
-TARGET_SRC = $(TARGET).cc
+  main_minimal.c \
-MODULES_SRC = $(filter-out main_%,$(ALL_SRC))
+  main_adc.cc \
-CXX_SRC = $(MODULES_SRC) $(TARGET_SRC)
+  main_memtest1.cc \
+  test_bla.c
 
-CXX_SOURCES = $(CXX_SRC)
+SOURCES := $(wildcard *)
+SOURCES := $(filter-out $(SRC_EXCLUDED), $(SOURCES))
 include $(LIBDAISY_DIR)/core/Makefile

src/Makefile

@@ -1,7 +1,5 @@
 HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
--include $(HERE)../Makefile.conf
+include $(HERE)../Makefile.conf
-
-ALL_SRC = $(wildcard *.cc)
-CXX_SOURCES = $(ALL_SRC)
 
+SOURCES = $(wildcard *)
 include $(LIBDAISY_DIR)/core/Makefile