X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Frules.mk;h=f62c5cd8a1e8158843217e52de2ba9fc91df4df9;hb=22e903f490208fcc6f6de86250c723b1f200a61d;hp=88939c287f9a473cb4ee9be95759f334770f347e;hpb=32f64632f5b613fa3fbdb86ccf5dfceb576b3bfd;p=bertos.git

diff --git a/bertos/rules.mk b/bertos/rules.mk
index 88939c28..f62c5cd8 100644
--- a/bertos/rules.mk
+++ b/bertos/rules.mk
@@ -36,25 +36,16 @@ endif
 # Initialize $(top_srcdir) with current directory, unless it was already initialized
 top_srcdir ?= $(shell pwd)
 
-# Products
-TRG_ELF = $(TRG:%=$(OUTDIR)/%.elf)
-TRG_S19 = $(TRG:%=$(OUTDIR)/%.s19)
-TRG_HEX = $(TRG:%=$(OUTDIR)/%.hex)
-TRG_BIN = $(TRG:%=$(OUTDIR)/%.bin)
-TRG_ROM = $(TRG:%=$(OUTDIR)/%.rom)
-TRG_COF = $(TRG:%=$(OUTDIR)/%.cof)
-TRG_EXE = $(TRG:%=$(OUTDIR)/%)
-
+# Virtual Product: based on target products may be different.
+# e.g. Embedded target = hex, s19, bin
+#      Hosted = exe
+TRG_TGT = $(TRG:%=$(OUTDIR)/%.tgt)
 
 RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive
 
 # The default target
 .PHONY: all
-ifeq ($(EMBEDDED_TARGET),1)
-all:: all-recursive $(TRG_S19) $(TRG_HEX) $(TRG_BIN)
-else
-all:: all-recursive $(TRG_EXE)
-endif
+all:: all-recursive $(TRG_TGT) 
 
 # Generate project documentation
 .PHONY: docs
@@ -76,6 +67,20 @@ check:
 
 define build_target
 
+ifeq ($$($(1)_EMBEDDED_TGT),1)
+#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
+#use hosted specific map flags
+$(1)_MAP_FLAGS = $$(MAP_FLAGS_HOST)
+#in hosted application we need only executable file.
+$$(OUTDIR)/$(1).tgt : $$(OUTDIR)/$(1)
+endif
+
+$(1)_LDFLAGS += $$($(1)_MAP_FLAGS)
+
 ifneq ($$(strip $$($(1)_MCU)),)
 # Define all project specific object files
 $(1)_CFLAGS    += -mmcu=$$($(1)_MCU)
@@ -100,6 +105,7 @@ $(1)_CC      = $$($(1)_CROSS)$$(CC)
 $(1)_CXX     = $$($(1)_CROSS)$$(CXX)
 $(1)_AS      = $$($(1)_CROSS)$$(AS)
 $(1)_OBJCOPY = $$($(1)_CROSS)$$(OBJCOPY)
+$(1)_STRIP   = $$($(1)_CROSS)$$(STRIP)
 
 $(1)_COBJ    = $$(foreach file,$$($(1)_CSRC:%.c=%.o),$$(OBJDIR)/$(1)/$$(file))
 $(1)_CXXOBJ  = $$(foreach file,$$($(1)_CXXSRC:%.cpp=%.o),$$(OBJDIR)/$(1)/$$(file))
@@ -264,7 +270,7 @@ $(RECURSIVE_TARGETS):
 		$(MAKE) -C $$dir $$target || exit 1; \
 	done
 
-BUILDREV_H = bertos/buildrev.h
+BUILDREV_H = buildrev.h
 
 ifeq ($(shell [ -e bertos/verstag.c ] && echo yes),yes)
 .PHONY: bumprev
@@ -274,7 +280,7 @@ bumprev:
 		buildnr=`sed <"$(BUILDREV_H)" -n -e 's/#define VERS_BUILD \([0-9][0-9]*\)/\1/p'`; \
 	fi; \
 	buildnr=`expr $$buildnr + 1`; \
-	buildhost=`hostname`; \
+	buildhost=`hostname | sed -n -e '1h;2,$$H;$${g;s/\n//g;p;}'`; \
 	echo "#define VERS_BUILD $$buildnr" >"$(BUILDREV_H)"; \
 	echo "#define VERS_HOST  \"$$buildhost\"" >>"$(BUILDREV_H)"; \
 	echo "Building revision $$buildnr"