Refactor KFileFlash25 to Flash25KFile. Tested.

[bertos.git] / bertos / rules.mk

diff --git a/bertos/rules.mk b/bertos/rules.mk
index 23d988f78585cf4ffecaec4bbde0f1315da3dab8..ec0943ae59905af2788bc793de348bcbe6c4b593 100644 (file)
--- a/bertos/rules.mk
+++ b/bertos/rules.mk
@@ -73,11 +73,11 @@ $(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 setted.
+#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 = ""
+LIST_FLAGS := ""
+MAP_FLAGS := ""
+LDFLAGS := ""
 endif
 #use hosted specific map flags
 $(1)_MAP_FLAGS = $$(MAP_FLAGS_HOST)
@@ -128,11 +128,20 @@ else
 $(1)_LD = $$($(1)_CROSS)$$(LD)
 endif
 
+# Sometimes $(CC) is actually set to a C++ compiler in disguise, and it
+# 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)
+else
+       REAL_CFLAGS = $$(CFLAGS)
+endif
+
 # Compile: instructions to create assembler and/or object files from C source
 $$($(1)_COBJ) : $$(OBJDIR)/$(1)/%.o : %.c
        $L "$(1): Compiling $$< (C)"
        @$$(MKDIR_P) $$(dir $$@)
-       $Q $$($(1)_CC) -c $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+       $Q $$($(1)_CC) -c $$(REAL_CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
 
 # Compile: instructions to create assembler and/or object files from C++ source
 $$($(1)_CXXOBJ) : $$(OBJDIR)/$(1)/%.o : %.cpp
@@ -279,23 +288,20 @@ $(RECURSIVE_TARGETS):
 
 BUILDREV_H = buildrev.h
 
-ifeq ($(shell [ -e bertos/verstag.c ] && echo yes),yes)
 .PHONY: bumprev
 bumprev:
-       @buildnr=0; \
-       if [ -f $(BUILDREV_H) ]; then \
-               buildnr=`sed <"$(BUILDREV_H)" -n -e 's/#define VERS_BUILD \([0-9][0-9]*\)/\1/p'`; \
+       @if [ -e bertos/verstag.c ]; then \
+               buildnr=0; \
+               if [ -f $(BUILDREV_H) ]; then \
+                       buildnr=`sed <"$(BUILDREV_H)" -n -e 's/#define VERS_BUILD \([0-9][0-9]*\)/\1/p'`; \
+               fi; \
+               buildnr=`expr $$buildnr + 1`; \
+               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"; \
        fi; \
-       buildnr=`expr $$buildnr + 1`; \
-       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"
-else
-.PHONY: bumprev
-bumprev:
-
-endif
+       #
 
 # Include dependencies
 ifneq ($(strip $(OBJ)),)