From 83d4e709af813764a482bb6118b39631dc750386 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Sat, 16 Oct 2010 23:59:00 -0300
Subject: [PATCH] Removed knowledge about distributors from manufacturers and
 (partially) from the top-level makefile.

- boom/dist/Makefile: generate all.{equ,inv,dsc} for all distributors in
  dist/
- boom/Makefile (EQU, INV, DSC): use dist/all.* instead of dist/*/db/all.*
- boom/Makefile (tar): also collect $(EQU), $(INV), and $(DSC)
- boom/manu/panasonic/Makefile, boom/manu/stackpole/Makefile,
  boom/manu/yageo/Makefile: include dist/all.equ instead of
  dist/dk/db/all.equ
---
 boom/Makefile                | 12 ++++++------
 boom/dist/Makefile           | 20 ++++++++++++++++++++
 boom/manu/panasonic/Makefile |  2 +-
 boom/manu/stackpole/Makefile |  2 +-
 boom/manu/yageo/Makefile     |  2 +-
 5 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 boom/dist/Makefile

diff --git a/boom/Makefile b/boom/Makefile
index 7c40a0b..790b8cd 100644
--- a/boom/Makefile
+++ b/boom/Makefile
@@ -2,14 +2,15 @@ BOOM=PATH=/home/moko/svn.openmoko.org/trunk/eda/boom:../boom:$$PATH boom
 
 KITS = 1
 
-DIST = dk
-EQU = $(DIST:%=dist/%/db/all.equ)
-INV = $(DIST:%=dist/%/db/all.inv)
-DSC = $(DIST:%=dist/%/db/all.dsc)
+EQU = dist/all.equ
+INV = dist/all.inv
+DSC = dist/all.dsc
 CHR = manu/panasonic/panasonic.chr manu/stackpole/stackpole.chr \
       manu/yageo/yageo.chr
 
-DB = $(CHR) \
+DIST = dk
+
+DB = $(EQU) $(INV) $(DSC) $(CHR) \
     $(DIST:%=dist/%/db/*.equ) \
     $(DIST:%=dist/%/db/*.inv) \
     $(DIST:%=dist/%/db/*.dsc)
@@ -40,4 +41,3 @@ spotless:
 
 tar:
 		tar cfj boom-db.tar.bz2 $(DB)
-		
diff --git a/boom/dist/Makefile b/boom/dist/Makefile
new file mode 100644
index 0000000..ece8eb5
--- /dev/null
+++ b/boom/dist/Makefile
@@ -0,0 +1,20 @@
+MASTER = all.equ all.dsc all.inv
+DIST = dk
+
+.PHONY:		all rebuild spotless
+
+all:		$(MASTER)
+
+all.equ:	Makefile
+		for n in $(DIST); do echo "include $$n/db/all.equ"; done >$@
+
+all.inv:	Makefile
+		for n in $(DIST); do echo "include $$n/db/all.inv"; done >$@
+
+all.dsc:	Makefile
+		for n in $(DIST); do echo "include $$n/db/all.dsc"; done >$@
+
+rebuild:
+		rm -f $(MASTER)
+
+spotless:	rebuild
diff --git a/boom/manu/panasonic/Makefile b/boom/manu/panasonic/Makefile
index 11db263..beb8ce7 100644
--- a/boom/manu/panasonic/Makefile
+++ b/boom/manu/panasonic/Makefile
@@ -1,4 +1,4 @@
 BOOM=PATH=/home/moko/svn.openmoko.org/trunk/eda/boom:../boom:$$PATH boom
 
-panasonic.chr:	../../dist/dk/db/all.equ panasonic.gen
+panasonic.chr:	../../dist/all.equ panasonic.gen
 	$(BOOM) gen2chr PANASONIC $^ >$@ || { rm -rf $@; exit 1; }
diff --git a/boom/manu/stackpole/Makefile b/boom/manu/stackpole/Makefile
index 1f0a279..0282092 100644
--- a/boom/manu/stackpole/Makefile
+++ b/boom/manu/stackpole/Makefile
@@ -1,4 +1,4 @@
 BOOM=PATH=/home/moko/svn.openmoko.org/trunk/eda/boom:../boom:$$PATH boom
 
-stackpole.chr:	../../dist/dk/db/all.equ stackpole.gen
+stackpole.chr:	../../dist/all.equ stackpole.gen
 	$(BOOM) gen2chr STACKPOLE $^ >$@ || { rm -rf $@; exit 1; }
diff --git a/boom/manu/yageo/Makefile b/boom/manu/yageo/Makefile
index 587634f..41bad93 100644
--- a/boom/manu/yageo/Makefile
+++ b/boom/manu/yageo/Makefile
@@ -1,4 +1,4 @@
 BOOM=PATH=/home/moko/svn.openmoko.org/trunk/eda/boom:../boom:$$PATH boom
 
-yageo.chr:	../../dist/dk/db/all.equ yageo.gen
+yageo.chr:	../../dist/all.equ yageo.gen
 	$(BOOM) gen2chr YAGEO $^ >$@ || { rm -rf $@; exit 1; }