X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Frules.mk;h=ff8e7d674b72ecbc905e099a81c545ae28c731c6;hb=2ab79cb0c9069ed5084627954b6e2c3493a5c4af;hp=ef364d1d601dede45c326c5281047d5eab4c7aa2;hpb=0e9db20f6fb7f4ec21edaae6c9270317ee5dcfd9;p=bertos.git

diff --git a/bertos/rules.mk b/bertos/rules.mk
index ef364d1d..ff8e7d67 100644
--- a/bertos/rules.mk
+++ b/bertos/rules.mk
@@ -39,6 +39,7 @@ top_srcdir ?= $(shell pwd)
 # Virtual Product: based on target products may be different.
 # e.g. Embedded target = hex, s19, bin
 #      Hosted = exe
+#      Library = lib.a
 TRG_TGT = $(TRG:%=$(OUTDIR)/%.tgt)
 
 RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive
@@ -61,28 +62,34 @@ tags:
 
 # Run testsuite
 .PHONY: check
-check:
+check: $(OUTDIR)/libunittest.a
 	$L "Running testsuite"
-	$Q ./run_tests.sh
+	$Q test/run_tests.sh
 
 define build_target
 
 ifneq ($$($(1)_CROSS),)
-#use embedded specific map flags
-$(1)_MAP_FLAGS = $$(MAP_FLAGS_EMB)
-#In embedded we need s19, hex and bin
-$$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1).s19 $$(OUTDIR)/$(1).hex $$(OUTDIR)/$(1).bin
+        #use embedded specific map flags
+        $(1)_MAP_FLAGS = $$(MAP_FLAGS_EMB)
+        #In embedded we need s19, hex and bin
+        $$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1).s19 $$(OUTDIR)/$(1).hex $$(OUTDIR)/$(1).bin
 else
-#On Darwin architecture the assembly doesn't link correctly if this flag is set.
-ifeq ($(shell uname | grep -c "Darwin"),1)
-LIST_FLAGS := ""
-MAP_FLAGS := ""
-LDFLAGS := ""
-endif
-#use hosted specific map flags
-$(1)_MAP_FLAGS = $$(MAP_FLAGS_HOST)
-#in hosted application we need only executable file.
-$$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1)
+        #On Darwin architecture the assembly doesn't link correctly if these flags are set.
+        ifeq ($(shell uname | grep -c "Darwin"),1)
+                LIST_FLAGS := ""
+                MAP_FLAGS := ""
+                LDFLAGS := ""
+        endif
+        #use hosted specific map flags
+        $(1)_MAP_FLAGS = $$(MAP_FLAGS_HOST)
+
+        #Handle library creation
+        ifeq ($$($(1)_MAKELIB),1)
+                $$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1).a
+        else
+                #Otherwise in  hosted application we need only executable file.
+                $$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1)
+        endif
 endif
 
 $(1)_LDFLAGS += $$($(1)_MAP_FLAGS)
@@ -91,29 +98,52 @@ $(1)_LDFLAGS += $$($(1)_MAP_FLAGS)
 # but there are different options on how pass
 # it to the compiler.
 ifneq ($$(strip $$($(1)_MCU)),)
-$(1)_MCPU = -mmcu=$$($(1)_MCU)
+        $(1)_MCPU = -mmcu=$$($(1)_MCU)
 endif
 ifneq ($$(strip $$($(1)_CPU)),)
-$(1)_MCPU = -mcpu=$$($(1)_CPU)
+        $(1)_MCPU = -mcpu=$$($(1)_CPU)
 endif
 
 # If a CPU is specified add to 
 # project specific flags.
 ifneq ($$($(1)_MCPU),)
-$(1)_CFLAGS    += $$($(1)_MCPU)
-$(1)_CXXFLAGS  += $$($(1)_MCPU)
-$(1)_ASFLAGS   += $$($(1)_MCPU)
-$(1)_CPPAFLAGS += $$($(1)_MCPU)
-$(1)_LDFLAGS   += $$($(1)_MCPU)
+        $(1)_CFLAGS    += $$($(1)_MCPU)
+        $(1)_CXXFLAGS  += $$($(1)_MCPU)
+        $(1)_ASFLAGS   += $$($(1)_MCPU)
+        $(1)_CPPAFLAGS += $$($(1)_MCPU)
+        $(1)_LDFLAGS   += $$($(1)_MCPU)
 endif
 
 ifneq ($$(strip $$($(1)_LDSCRIPT)),)
-$(1)_LDFLAGS += -Wl,-T$$($(1)_LDSCRIPT)
+        $(1)_LDFLAGS += -Wl,-T$$($(1)_LDSCRIPT)
+endif
+
+# Debug stuff
+ifeq ($$($(1)_DEBUG),1)
+        # AVR is an harvard processor
+        # and needs debug module
+        # to be compiled in program memory
+        ifeq ($$(findstring avr, $$($(1)_CROSS)),avr)
+                $(1)_DEBUGSRC = $(1)_PCSRC
+        else
+                $(1)_DEBUGSRC = $(1)_CSRC
+        endif
+
+        $$($(1)_DEBUGSRC) += bertos/drv/kdebug.c
+
+        # Also add formatwr.c (printf) if not already present
+        ifneq ($$(findstring formatwr.c, $$($$($(1)_DEBUGSRC))),formatwr.c)
+                $$($(1)_DEBUGSRC) += bertos/mware/formatwr.c
+        endif
+
+        $(1)_CFLAGS += -D_DEBUG	
+        $(1)_CXXFLAGS += -D_DEBUG
 endif
 
 $(1)_CC      = $$($(1)_CROSS)$$(CC)
 $(1)_CXX     = $$($(1)_CROSS)$$(CXX)
 $(1)_AS      = $$($(1)_CROSS)$$(AS)
+$(1)_AR      = $$($(1)_CROSS)$$(AR)
 $(1)_OBJCOPY = $$($(1)_CROSS)$$(OBJCOPY)
 $(1)_STRIP   = $$($(1)_CROSS)$$(STRIP)
 
@@ -136,9 +166,9 @@ endif
 # would whine if we passed it C-only flags.  Checking for the presence of
 # "++" in the name is a kludge that seems to work mostly.
 ifeq (++,$$(findstring ++,$$($(1)_CC)))
-	REAL_CFLAGS = $$(CXXFLAGS)
+        REAL_CFLAGS = $$(CXXFLAGS)
 else
-	REAL_CFLAGS = $$(CFLAGS)
+        REAL_CFLAGS = $$(CFLAGS)
 endif
 
 # Compile: instructions to create assembler and/or object files from C source
@@ -183,6 +213,13 @@ $$(OUTDIR)/$(1).elf $$(OUTDIR)/$(1)_nostrip: bumprev $$($(1)_OBJ) $$($(1)_LDSCRI
 	@$$(MKDIR_P) $$(dir $$@)
 	$Q $$($(1)_LD) $$($(1)_OBJ) $$(LIB) $$(LDFLAGS) $$($(1)_LDFLAGS) -o $$@
 
+
+# Instructions to create a static library from object files
+$$(OUTDIR)/$(1).a: bumprev $$($(1)_OBJ)
+	$L "$(1): Creating static library $$@"
+	@$$(MKDIR_P) $$(dir $$@)
+	$Q $$($(1)_AR) $$(ARFLAGS) $$($(1)_ARFLAGS) $$@ $$($(1)_OBJ)
+
 # Strip debug info
 $$(OUTDIR)/$(1): $$(OUTDIR)/$(1)_nostrip
 	$L "$(1): Generating stripped executable $$@"
@@ -247,14 +284,14 @@ $$(OUTDIR)/$(1).rom: $$(OUTDIR)/$(1).elf
 
 endef
 
-# Generate build rules for all targets
-$(foreach t,$(TRG),$(eval $(call build_target,$(t))))
+# Generate build rules for all targets and libunittest
+$(foreach t,$(TRG) libunittest,$(eval $(call build_target,$(t))))
 
 # Generate Qt's moc files from headers
 # NOTE: moc totally sucks and can generate empty files for some error conditions,
 #       leading to puzzling linker errors.  Kill 'em and abort build.
 %_moc.cpp: %.h
-	$(MOC) -o $@ $<
+	$(QT_MOC) -o $@ $<
 	if [ ! -s $< ]; then \
 		rm -f $@; \
 		exit 1; \