r5887 - in trunk/gta02-core: . bom

[werner at docs.openmoko.org]

Author: werner
Date: 2010-04-03 13:21:29 +0200 (Sat, 03 Apr 2010)
New Revision: 5887

Modified:
   trunk/gta02-core/Makefile
   trunk/gta02-core/bom/Makefile
Log:
- Makefile: when generating schematics annotated with component descriptions,
  use "make null" as a basis, not "make optimist"
- bom/Makefile: when annotating schematics, consult all .dsc files, not only
  fic.dsc, 



Modified: trunk/gta02-core/Makefile
===================================================================
--- trunk/gta02-core/Makefile	2010-04-03 04:37:44 UTC (rev 5886)
+++ trunk/gta02-core/Makefile	2010-04-03 11:21:29 UTC (rev 5887)
@@ -18,7 +18,7 @@
 		scripts/all-sheets --shrink --pdf gta02-core
 		$(MAKE) -C expanded gen
 		$(MAKE) -C modules gen
-		$(MAKE) -C bom optimist gen
+		$(MAKE) -C bom null gen
 
 update:
 		svn update

Modified: trunk/gta02-core/bom/Makefile
===================================================================
--- trunk/gta02-core/bom/Makefile	2010-04-03 04:37:44 UTC (rev 5886)
+++ trunk/gta02-core/bom/Makefile	2010-04-03 11:21:29 UTC (rev 5887)
@@ -12,6 +12,8 @@
     dk/digi-key.inv mouser/mouser.inv farnell/farnell.inv arrow/arrow.inv
 CHR=darfon.chr ralec.chr avx.chr acx.chr misc.chr stackpole.chr
 SCH=audio bt cpu-power cpu gps io lcm memory modem pmu sd-sim usb wlan
+DSC=fic/fic.dsc dk/digi-key.dsc mouser/mouser.dsc farnell/farnell.dsc \
+    arrow/arrow.dsc
 
 .PHONY:		all optimist pessimist null spotless
 .PHONY:		show-dup show-missing
@@ -122,15 +124,15 @@
 
 #ANN = pmu
 ANN = audio
-ann:		../$(ANN).sch fic/fic.dsc gta02-core.par $(EQU)
-		$(BOOM) annotate ../$(ANN).sch fic/fic.dsc gta02-core.par \
+ann:		../$(ANN).sch $(DSC) gta02-core.par $(EQU)
+		$(BOOM) annotate ../$(ANN).sch $(DSC) gta02-core.par \
 		  $(EQU) >$(ANN)-bom.sch || { rm -f $(ANN)-bom.sch; exit 1; }
 
 $(SCH:%=%-bom.sch): \
-		$(SCH:%=../%.sch) fic/fic.dsc gta02-core.$(ANNOTATE) $(EQU)
+		$(SCH:%=../%.sch) $(DSC) gta02-core.$(ANNOTATE) $(EQU)
 		for n in $(SCH); do \
 		    $(BOOM) annotate '-s/OldPn (\S+)/FIC/' \
-		      ../$$n.sch fic/fic.dsc \
+		      ../$$n.sch $(DSC) \
 		      gta02-core.$(ANNOTATE) $(EQU) >$$n-bom.sch \
 		      || { rm -f $$n-bom.sch; exit 1; }; \
 		done