X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=rules.mk;h=1289740f2471f30d4b225310cd8b4b88bed0be65;hb=941529ddc4cddd04f69d38c0929ec00fe93aadef;hp=e764924e29685b7ba8c214363d30bee3e05dc077;hpb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;p=bertos.git

diff --git a/rules.mk b/rules.mk
old mode 100755
new mode 100644
index e764924e..1289740f
--- a/rules.mk
+++ b/rules.mk
@@ -1,6 +1,6 @@
 #
 # $Id$
-# Copyright 2002, 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+# Copyright 2002,2003,2004,2005,2006 Develer S.r.l. (http://www.develer.com/)
 # All rights reserved.
 #
 # Based on:
@@ -9,76 +9,6 @@
 #
 # Author: Bernardo Innocenti <bernie@develer.com>
 #
-# $Log$
-# Revision 1.4  2006/07/19 12:56:24  bernie
-# Convert to new Doxygen style.
-#
-# Revision 1.3  2006/05/27 22:42:24  bernie
-# Search for verstag.h in app subdirs first.
-#
-# Revision 1.2  2006/03/27 04:48:33  bernie
-# Add CXXFLAGS; Add recursive targets.
-#
-# Revision 1.1  2006/03/22 09:51:53  bernie
-# Add build infrastructure.
-#
-# Revision 1.39  2005/11/22 12:10:24  batt
-# Avoid double build version increment.
-#
-# Revision 1.38  2005/11/18 13:29:33  batt
-# Bumprev now work on linking and not only on make all.
-#
-# Revision 1.37  2005/03/20 03:59:44  bernie
-# Fix link message to display target file name.
-#
-# Revision 1.36  2004/10/29 17:05:33  customer_pw
-# Allow overriding flash_foobar rules.
-#
-# Revision 1.35  2004/10/20 10:00:14  customer_pw
-# Simplify variable
-#
-# Revision 1.34  2004/10/19 11:06:51  bernie
-# Set top_srcdir.
-#
-# Revision 1.33  2004/10/19 10:56:20  bernie
-# More specific logging messages.
-#
-# Revision 1.32  2004/10/18 14:40:45  customer_pw
-# Add fuse var empty check
-#
-# Revision 1.31  2004/10/15 17:49:27  batt
-# Do not verify avr chip after flashing to speed up the programming task.
-#
-# Revision 1.30  2004/10/09 10:34:16  aleph
-# Fix broken linker rule
-#
-# Revision 1.29  2004/10/08 17:26:50  customer_pw
-# No infinite loop in fuse programming rule; Better dependencies for linking.
-#
-# Revision 1.28  2004/10/03 18:26:52  bernie
-# Unparenthesize $Q.
-#
-# Revision 1.27  2004/09/30 14:49:53  customer_pw
-# Add silent build
-#
-# Revision 1.26  2004/09/28 16:58:52  customer_pw
-# Repeat twice eeprom flashing
-#
-# Revision 1.25  2004/09/27 12:20:13  customer_pw
-# Remove annoying flashing loop
-#
-# Revision 1.24  2004/09/23 17:19:50  customer_pw
-# Per-target fuse rules, with retry.
-#
-# Revision 1.23  2004/09/20 02:49:28  bernie
-# Use  for linking.
-#
-# Revision 1.22  2004/09/14 22:19:09  bernie
-# Create missing dirs.
-#
-# Revision 1.21  2004/08/31 10:25:10  customer_pw
-# Remove mainly useless -y write count option of avrdude
-#
 
 # Remove all default pattern rules
 .SUFFIXES:
@@ -94,6 +24,15 @@ Q := @
 L := @echo
 endif
 
+# Select Bourne Again SHell as default make shell
+SHELL := bash
+
+# Checker build
+ifeq ($(C),1)
+CC = $(CHECKER)
+CFLAGS += -Wundef -D__x86_64__=1 -D__unix__=1 -D__linux__=1 -D__STDC_VERSION__=199901L
+endif
+
 # Initialize $(top_srcdir) with current directory, unless it was already initialized
 top_srcdir ?= $(shell pwd)
 
@@ -104,13 +43,18 @@ TRG_HEX = $(TRG:%=$(OUTDIR)/%.hex)
 TRG_BIN = $(TRG:%=$(OUTDIR)/%.bin)
 TRG_ROM = $(TRG:%=$(OUTDIR)/%.rom)
 TRG_COF = $(TRG:%=$(OUTDIR)/%.cof)
+TRG_EXE = $(TRG:%=$(OUTDIR)/%)
 
 
 RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive
 
 # The default target
 .PHONY: all
-all:: all-recursive $(TRG_S19) $(TRG_HEX)
+ifeq ($(EMBEDDED_TARGET),1)
+all:: all-recursive $(TRG_S19) $(TRG_HEX) $(TRG_BIN)
+else
+all:: all-recursive $(TRG_EXE)
+endif
 
 # Generate project documentation
 .PHONY: docs
@@ -127,6 +71,14 @@ $(1)_ASFLAGS   += -mmcu=$$($(1)_MCU)
 $(1)_CPPAFLAGS += -mmcu=$$($(1)_MCU)
 $(1)_LDFLAGS   += -mmcu=$$($(1)_MCU)
 endif
+ifneq ($$(strip $$($(1)_CPU)),)
+# Define all project specific object files
+$(1)_CFLAGS    += -mcpu=$$($(1)_CPU)
+$(1)_CXXFLAGS  += -mcpu=$$($(1)_CPU)
+$(1)_ASFLAGS   += -mcpu=$$($(1)_CPU)
+$(1)_CPPAFLAGS += -mcpu=$$($(1)_CPU)
+$(1)_LDFLAGS   += -mcpu=$$($(1)_CPU)
+endif
 ifneq ($$(strip $$($(1)_LDSCRIPT)),)
 $(1)_LDFLAGS += -Wl,-T$$($(1)_LDSCRIPT)
 endif
@@ -144,25 +96,25 @@ OBJ         += $$($(1)_OBJ)
 $$($(1)_COBJ) : $$(OBJDIR)/$(1)/%.o : %.c
 	$L "$(1): Compiling $$< (C)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$(CC) -c $$($(1)_CFLAGS) $$(CFLAGS) $$< -o $$@
+	$Q $$(CC) -c $$(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
 	$L "$(1): Compiling $$< (C++)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$(CXX) -c $$($(1)_CXXFLAGS) $$(CXXFLAGS) $$< -o $$@
+	$Q $$(CXX) -c $$(CXXFLAGS) $$($(1)_CXXFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
 
 # Generate assembly sources from C files (debug)
 $$(OBJDIR)/$(1)/%.s : %.c
 	$L "$(1): Generating asm source $$<"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$(CC) -S $$($(1)_CFLAGS) $$(CFLAGS) $$< -o $$@
+	$Q $$(CC) -S $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$< -o $$@
 
 # Generate special progmem variant of a source file
 $$($(1)_PCOBJ) : $$(OBJDIR)/$(1)/%_P.o : %.c
 	$L "$(1): Compiling $$< (PROGMEM)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$(CC) -c -D_PROGMEM $$($(1)_CFLAGS) $$(CFLAGS) $$< -o $$@
+	$Q $$(CC) -c -D_PROGMEM $$(CFLAGS) $$($(1)_CFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
 
 # Assemble: instructions to create object file from assembler files
 $$($(1)_AOBJ): $$(OBJDIR)/$(1)/%.o : %.s
@@ -173,19 +125,25 @@ $$($(1)_AOBJ): $$(OBJDIR)/$(1)/%.o : %.s
 $$($(1)_CPPAOBJ): $$(OBJDIR)/$(1)/%.o : %.S
 	$L "$(1): Assembling with CPP $$<"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$(CC) -c $$(CPPAFLAGS) $$($(1)_CPPAFLAGS) $$< -o $$@
+	$Q $$(CC) -c $$(CPPAFLAGS) $$($(1)_CPPAFLAGS) $$($(1)_CPPFLAGS) $$(CPPFLAGS) $$< -o $$@
+	
 
 # Link: instructions to create elf output file from object files
-$$(OUTDIR)/$(1).elf: bumprev $$($(1)_OBJ) $$($(1)_LDSCRIPT)
+$$(OUTDIR)/$(1).elf $$(OUTDIR)/$(1)_nostrip: bumprev $$($(1)_OBJ) $$($(1)_LDSCRIPT)
 	$L "$(1): Linking $$@"
 	@$$(MKDIR_P) $$(dir $$@)
 	$Q $$(LD) $$($(1)_OBJ) $$(LIB) $$(LDFLAGS) $$($(1)_LDFLAGS) -o $$@
 
+# Strip debug info
+$$(OUTDIR)/$(1): $$(OUTDIR)/$(1)_nostrip
+	$L "$(1): Generating stripped executable $$@"
+	$Q $$(STRIP) -o $$@ $$^
+ 
 # Compile and link (program-at-a-time)
 $$(OUTDIR)/$(1)_whole.elf: bumprev $$($(1)_SRC) $$($(1)_LDSCRIPT)
 	$L "$(1): Compiling and Linking whole program $$@"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$(CC) $$($(1)_SRC) $$($(1)_CFLAGS) $$(CFLAGS) $$(LIB) $$(LDFLAGS) $$($(1)_LDFLAGS) -o $$@
+	$Q $$(CC) $$($(1)_SRC) $$(CFLAGS) $$($(1)_CFLAGS) $$(LIB) $$(LDFLAGS) $$($(1)_LDFLAGS) -o $$@
 
 # Flash target
 # NOTE: we retry in case of failure because the STK500 programmer is crappy
@@ -226,6 +184,15 @@ endef
 # Generate build rules for all targets
 $(foreach t,$(TRG),$(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 $@ $<
+	if [ -s $< ]; then \
+		rm $@; \
+		exit 1; \
+	fi
 
 %.hex: %.elf
 	$(OBJCOPY) -O ihex $< $@
@@ -273,7 +240,7 @@ $(RECURSIVE_TARGETS):
 
 BUILDREV_H = buildrev.h
 
-ifeq ($(shell [ -e verstag.c ] && echo yes), yes)
+ifeq ($(shell [ -e verstag.c ] && echo yes),yes)
 .PHONY: bumprev
 bumprev:
 	@buildnr=0; \