Candidate fix for the libboard.a dependency problem (from Mike Smith)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4346 42af7a65-404d-4744-a932-0658087f49c3

16 files changed, 63 insertions, 27 deletions

diff --git a/apps/README.txt b/apps/README.txt
index cbef1602a..6d14c6b14 100644
--- a/apps/README.txt
+++ b/apps/README.txt
@@ -195,6 +195,9 @@ A: Here are four:
          setenv.sh->nuttx/setenv.sh, Make.defs->nuttx/Make.defs,
          appconfig->apps/.config
 
+      Using the 'external' link makes it especially easy to add a
+      'built-in' application an existing configuration.
+
    4) Add any link to apps/
 
       a) Add symbolic links apps/ to as many other directories as you
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 2c06338c7..271d7fb89 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -2401,5 +2401,10 @@
 	  Add a configuration test the USB composite device.
 	* include/nuttx/usb/usb.h, drivers/usbdev/composite_descriptors.c, and
 	  drivers/usbdev/cdcacm_descriptors.c:  Add support for the USB Interface
-          Association Descriptor (IAD)
+	  Association Descriptor (IAD)
 	* arch/arm/src/stm32/stm32_i2c.c: Correct a typo in STM32 I2C3 support
+	  (submitted by Mike Smith)
+	* arch/*/src/Makefile:  Candidate solution for dependency issue in the board
+	  sub-directory:  By making libboard.a a "phony" target, libboard.a should
+	  always rebuilt (the end result is worth the small increase in build time)
+	  (submitted by Mike Smith).
diff --git a/nuttx/TODO b/nuttx/TODO
index 3165a72bf..09b886adc 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -668,6 +668,12 @@ o Build system
   Title:       DEPENDENCIES IN THE BOARD DIRECTORY
   Description: Dependencies do not work correctly under configs/<board>/src
                (same as arch/<arch>/src/board).
+               UPDATE:  Added the following to each arch/*/src/Makefile:
+               
+               PHONY: board/libboard$(LIBEXT)
+
+               However, I have not confirmed that this a full-proof fix in
+               all cases -- still under test (thanks to Mike Smith).
   Status:      Open
   Priority:    Medium (maybe higher for z80 target)
 
diff --git a/nuttx/arch/8051/src/Makefile b/nuttx/arch/8051/src/Makefile
index f04518913..87ff4daf5 100644
--- a/nuttx/arch/8051/src/Makefile
+++ b/nuttx/arch/8051/src/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/8051/src/Makefile
 #
-#   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2007, 2008, 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -107,6 +107,8 @@ STACK_BASE	= ${shell \
 
 all: up_head$(OBJEXT) libarch$(LIBEXT)
 
+.PHONY: board/libboard$(LIBEXT)
+
 $(ASRCS) $(LINKASRCS): %$(ASMEXT): %.S
 	$(CPP) -P $(CPPFLAGS) $< -o $@
 
@@ -189,7 +191,7 @@ nuttx$(EXEEXT): pass1.ihx nuttx.ihx
 
 # This is part of the top-level export target
 
-export_head: uboard/libboard$(LIBEXT) p_head$(OBJEXT)
+export_head: board/libboard$(LIBEXT) p_head$(OBJEXT)
 	@if [ -d "$(EXPORT_DIR)/startup" ]; then \
 		cp -f up_head$(OBJEXT) "$(EXPORT_DIR)/startup"; \
 	 else \
diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile
index 7e1cfdb0c..3868f6c9a 100644
--- a/nuttx/arch/arm/src/Makefile
+++ b/nuttx/arch/arm/src/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/arm/src/Makefile
 #
-#   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -91,6 +91,8 @@ VPATH		= chip:common:$(ARCH_SUBDIR)
 
 all: $(HEAD_OBJ) libarch$(LIBEXT)
 
+.PHONY: board/libboard$(LIBEXT)
+
 $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
 
diff --git a/nuttx/arch/avr/src/Makefile b/nuttx/arch/avr/src/Makefile
index fa66d6dfa..7b297f1c1 100644
--- a/nuttx/arch/avr/src/Makefile
+++ b/nuttx/arch/avr/src/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/avr/src/Makefile
 #
-#   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -96,6 +96,8 @@ VPATH		= chip:common:$(ARCH_SUBDIR)
 
 all: $(HEAD_OBJ) libarch$(LIBEXT)
 
+.PHONY: board/libboard$(LIBEXT)
+
 $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
 
diff --git a/nuttx/arch/hc/src/Makefile b/nuttx/arch/hc/src/Makefile
index a5e0425a8..101f24e42 100755
--- a/nuttx/arch/hc/src/Makefile
+++ b/nuttx/arch/hc/src/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/hc/src/Makefile
 #
-#   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -87,6 +87,7 @@ LIBGCC		= "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
 VPATH		= chip:common:$(ARCH_SUBDIR)
 
 all: $(HEAD_OBJ) libarch$(LIBEXT)
+.PHONY: board/libboard$(LIBEXT)
 
 $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
diff --git a/nuttx/arch/mips/src/Makefile b/nuttx/arch/mips/src/Makefile
index 8d0f4d5af..b57831441 100644
--- a/nuttx/arch/mips/src/Makefile
+++ b/nuttx/arch/mips/src/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/mips/src/Makefile
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -85,6 +85,8 @@ VPATH		= chip:common:$(ARCH_SUBDIR)
 
 all: $(HEAD_OBJ) libarch$(LIBEXT)
 
+.PHONY: board/libboard$(LIBEXT)
+
 $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
 
diff --git a/nuttx/arch/rgmp/src/Makefile b/nuttx/arch/rgmp/src/Makefile
index f973a28fa..4f5d87ad6 100644
--- a/nuttx/arch/rgmp/src/Makefile
+++ b/nuttx/arch/rgmp/src/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/rgmp/src/Makefile
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -56,6 +56,7 @@ LDPATHS		+= -L$(RGMPLIBDIR)
 LDLIBS		+= -lrgmp -lm -ltest $(shell gcc -print-libgcc-file-name)
 
 all: libarch$(LIBEXT)
+
 .PHONY: clean distclean depend
 
 $(AOBJS): %$(OBJEXT): %.S
diff --git a/nuttx/arch/sh/src/Makefile b/nuttx/arch/sh/src/Makefile
index fdf6cc852..a9683fe08 100644
--- a/nuttx/arch/sh/src/Makefile
+++ b/nuttx/arch/sh/src/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/sh/src/Makefile
 #
-#   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -65,6 +65,8 @@ VPATH		= chip:common
 
 all: $(HEAD_OBJ) libarch$(LIBEXT)
 
+.PHONY: board/libboard$(LIBEXT)
+
 $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
 
diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile
index 9189a2165..e457e5411 100644
--- a/nuttx/arch/sim/src/Makefile
+++ b/nuttx/arch/sim/src/Makefile
@@ -131,7 +131,8 @@ LDLIBS += -lboard
 # Make targets begin here
 
 all: up_head$(OBJEXT) libarch$(LIBEXT)
-.PHONY: export_head clean distclean cleanrel depend
+
+.PHONY: board/libboard$(LIBEXT) export_head clean distclean cleanrel depend
 
 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
diff --git a/nuttx/arch/x86/src/Makefile b/nuttx/arch/x86/src/Makefile
index d7b2140c8..e91df0c85 100644
--- a/nuttx/arch/x86/src/Makefile
+++ b/nuttx/arch/x86/src/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/x86/src/Makefile
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -93,6 +93,8 @@ VPATH		= chip:common:$(ARCH_SUBDIR)
 
 all: $(HEAD_OBJ) libarch$(LIBEXT)
 
+.PHONY: board/libboard$(LIBEXT)
+
 $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
 
diff --git a/nuttx/arch/z16/src/Makefile b/nuttx/arch/z16/src/Makefile
index 56ae6eb54..40dc73c5e 100644
--- a/nuttx/arch/z16/src/Makefile
+++ b/nuttx/arch/z16/src/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/z16/src/Makefile
 #
-#   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -71,6 +71,8 @@ VPATH		= chip:common
 
 all: $(HEAD_OBJ) libarch$(LIBEXT)
 
+.PHONY: board/libboard$(LIBEXT)
+
 ifeq ($(COMPILER),zneocc.exe)
 $(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
 	@$(CPP) $(CPPFLAGS) $< -o $@.tmp
diff --git a/nuttx/arch/z80/src/Makefile b/nuttx/arch/z80/src/Makefile
index 93f32aa9d..92759de17 100644
--- a/nuttx/arch/z80/src/Makefile
+++ b/nuttx/arch/z80/src/Makefile
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/z80/src/Makefile
 #
-#   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2007, 2008, 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/nuttx/arch/z80/src/Makefile.sdcc b/nuttx/arch/z80/src/Makefile.sdcc
index a9152ea79..fdb949fa5 100644
--- a/nuttx/arch/z80/src/Makefile.sdcc
+++ b/nuttx/arch/z80/src/Makefile.sdcc
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/z80/src/Makefile.sdcc
 #
-#   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -86,6 +86,8 @@ HEAP_BASE	= ${shell ./mkhpbase.sh}
 
 all: $(HEAD_OBJ) libarch$(LIBEXT)
 
+.PHONY: board/libboard$(LIBEXT)
+
 $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT)
 	$(call ASSEMBLE, $<, $@)
 
diff --git a/nuttx/arch/z80/src/Makefile.zdsii b/nuttx/arch/z80/src/Makefile.zdsii
index 319d94cb2..a105597a9 100644
--- a/nuttx/arch/z80/src/Makefile.zdsii
+++ b/nuttx/arch/z80/src/Makefile.zdsii
@@ -1,8 +1,8 @@
 ############################################################################
 # arch/z16/src/Makefile
 #
-#   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -69,8 +69,11 @@ VPATH		= chip:common
 
 ############################################################################
 # Targets
+
 all: $(HEAD_OBJ) libarch$(LIBEXT)
 
+.PHONY: board/libboard$(LIBEXT)
+
 $(HEAD_GENSRC) $(GENSRCS) : %$(ASMEXT): %.S
 	@$(CPP) $(CPPFLAGS) $< -o $@.tmp
 	@cat $@.tmp | sed -e "s/^#/;/g" > $@