X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=rules.mk;h=41d1e1cb9e33d948c5df814735c8f11cff2b0154;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=4b53a17f50ca83692906b7d283d1bae7639bafec;hpb=cc15bc8568ee6dc6032687a6f8d892b702e9c8a2;p=bertos.git

diff --git a/rules.mk b/rules.mk
old mode 100755
new mode 100644
index 4b53a17f..41d1e1cb
--- 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,67 +9,6 @@
 #
 # Author: Bernardo Innocenti <bernie@develer.com>
 #
-# $Log$
-# 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:
@@ -85,6 +24,12 @@ Q := @
 L := @echo
 endif
 
+# 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)
 
@@ -96,9 +41,12 @@ TRG_BIN = $(TRG:%=$(OUTDIR)/%.bin)
 TRG_ROM = $(TRG:%=$(OUTDIR)/%.rom)
 TRG_COF = $(TRG:%=$(OUTDIR)/%.cof)
 
+
+RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive
+
 # The default target
 .PHONY: all
-all:: $(TRG_S19) $(TRG_HEX)
+all:: all-recursive $(TRG_S19) $(TRG_HEX)
 
 # Generate project documentation
 .PHONY: docs
@@ -130,27 +78,27 @@ OBJ         += $$($(1)_OBJ)
 
 # Compile: instructions to create assembler and/or object files from C source
 $$($(1)_COBJ) : $$(OBJDIR)/$(1)/%.o : %.c
-	$L "$(1): Compiling $$<"
+	$L "$(1): Compiling $$< (C)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$(CC) -c $$(CFLAGS) $$($(1)_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 $$<"
+	$L "$(1): Compiling $$< (C++)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$(CXX) -c $$(CFLAGS) $$($(1)_CFLAGS) $$< -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 $$(CFLAGS) $$($(1)_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 $$(CFLAGS) $$($(1)_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
@@ -161,13 +109,14 @@ $$($(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)
-	$L "$(1): Linking $$@"
+	$L "$(1): Linking $$(OUTDIR)/$(1)"
 	@$$(MKDIR_P) $$(dir $$@)
-	$Q $$(LD) $$($(1)_OBJ) $$(LIB) $$(LDFLAGS) $$($(1)_LDFLAGS) -o $$@
+	$Q $$(LD) $$($(1)_OBJ) $$(LIB) $$(LDFLAGS) $$($(1)_LDFLAGS) -o $$(OUTDIR)/$(1)_nostrip
+	$Q $$(STRIP) -o $$(OUTDIR)/$(1) $$(OUTDIR)/$(1)_nostrip
 
 # Compile and link (program-at-a-time)
 $$(OUTDIR)/$(1)_whole.elf: bumprev $$($(1)_SRC) $$($(1)_LDSCRIPT)
@@ -182,6 +131,7 @@ flash_$(1): $(OUTDIR)/$(1).s19 flash_$(1)_local
 	if ! $(AVRDUDE) $(DPROG) -p $$($(1)_MCU) -U flash:w:$$< ; then \
 	     $(AVRDUDE) $(DPROG) -p $$($(1)_MCU) -U flash:w:$$< ; \
 	fi
+	#avarice --mkII -j usb --erase --program --verify --file images/triface.elf
 
 .PHONY: flash_$(1)_local
 flash_$(1)_local:
@@ -213,6 +163,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 $< $@
@@ -235,12 +194,33 @@ $(foreach t,$(TRG),$(eval $(call build_target,$(t))))
 #	$(COFFCONVERT) -O coff-avr $< $@   # For use with AVRstudio 3
 
 #make instruction to delete created files
-clean:
+clean: clean-recursive
 	-$(RM_R) $(OBJDIR)
 	-$(RM_R) $(OUTDIR)
 
+$(RECURSIVE_TARGETS):
+	@target=`echo $@ | sed s/-recursive//`; \
+	for dir in $(SUBDIRS); do \
+		if [ -e $$dir/configure.in ] || [ -e $$dir/configure.ac ] && [ ! -x $$dir/configure ]; then \
+			echo "Running autogen.sh in $$dir..."; \
+			( cd $$dir && chmod a+x autogen.sh && ./autogen.sh && rm -f Makefile || exit 1 ); \
+		fi; \
+		if [ ! -e $$dir/Makefile ]; then \
+			if [ -e "$$dir/build-$(ARCH)" ]; then \
+				echo "Running build script in $$dir..."; \
+				( cd $$dir && chmod a+x build && ./build || exit 1 ); \
+			else \
+				echo "Running configure in $$dir..."; \
+				( cd $$dir && ./configure --prefix=$(PREFIX) || exit 1 ); \
+			fi; \
+		fi; \
+		$(MAKE) -C $$dir $$target || exit 1; \
+	done
+
 BUILDREV_H = buildrev.h
 
+ifeq ($(shell [ -e verstag.c ] && echo yes),yes)
+.PHONY: bumprev
 bumprev:
 	@buildnr=0; \
 	if [ -f $(BUILDREV_H) ]; then \
@@ -251,7 +231,13 @@ bumprev:
 	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)),)
 -include $(OBJ:%.o=%.d)
-
+endif