2001-05-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.in: Add bspopts.h.
	* include/.cvsignore: Add bspopts.h*, stamp-h*.
	* include/Makefile.am: Use *_HEADERS instead of *H_FILES.
	* include/bsp.h: Include bspopts.h.

7 files changed, 32 insertions, 26 deletions

diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
index d77e5a98b3..bc3bedf194 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.in: Add bspopts.h.
+	* include/.cvsignore: Add bspopts.h*, stamp-h*.
+	* include/Makefile.am: Use *_HEADERS instead of *H_FILES.
+	* vectors/Makefile.am: Ditto.
+	* include/bsp.h: Include bspopts.h.
+
 2001-05-10	Ralf Corsepius	<corsepiu@faw.uni-ulm.de>
 
 	* configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]).
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/configure.in b/c/src/lib/libbsp/powerpc/eth_comm/configure.in
index 129148ba5a..7c9dbbf0a2 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/configure.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.in
@@ -23,6 +23,7 @@ RTEMS_CANONICAL_HOST
 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
+AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT
 
 # Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/include/.cvsignore
+++ b/c/src/lib/libbsp/powerpc/eth_comm/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am
index 49898fe552..182387af33 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am
@@ -4,9 +4,10 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h coverhd.h canbus.h info.h
+include_bspdir = $(includedir)/bsp
 
-BSP_H_FILES = commproc.h 8xx_immap.h
+include_HEADERS = bsp.h coverhd.h canbus.h info.h bspopts.h
+include_bsp_HEADERS = commproc.h 8xx_immap.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -14,31 +15,16 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/bsp: 
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/coverhd.h: coverhd.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/canbus.h: canbus.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/info.h: info.h
-	$(INSTALL_DATA) $< $@
-
- $(PROJECT_INCLUDE)/bsp/commproc.h : commproc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/bsp/8xx_immap.h : 8xx_immap.h
+ $(PROJECT_INCLUDE)/bsp/%.h : %.h
 	$(INSTALL_DATA) $< $@
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
-	$(PROJECT_INCLUDE)/bsp.h $(PROJECT_INCLUDE)/info.h \
-	$(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/canbus.h \
-	$(PROJECT_INCLUDE)/bsp/commproc.h $(PROJECT_INCLUDE)/bsp/8xx_immap.h
+	$(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
+	$(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
 
 all-local: $(PREINSTALL_FILES)
 
-EXTRA_DIST = bsp.h canbus.h coverhd.h info.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h b/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h
index 600a948672..641ef59c13 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h
@@ -21,6 +21,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <console.h>
 #include <clockdrv.h>
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am
index 4b5bc87fe4..f2da3c09fd 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am
@@ -4,10 +4,12 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
+include_bspdir = $(includedir)/bsp
+
 C_FILES = irq.c irq_init.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES = irq.h
+include_bsp_HEADERS = irq.h
 
 S_FILES = irq_asm.S
 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
@@ -18,6 +20,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../../automake/compile.am
 include $(top_srcdir)/../../../../../../automake/lib.am
 
+## FIXME: WTF is this?
 SORDID_HACK:
 	rm -f $(PROJECT_INCLUDE)/bsp/irq.h
 
@@ -28,7 +31,7 @@ $(PROJECT_INCLUDE)/bsp/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp \
-    $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+    $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am
index d3a237fee4..88cd6c2f02 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am
@@ -9,7 +9,8 @@ VPATH = @srcdir@:
 C_FILES = vectors_init.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES = vectors.h
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = vectors.h
 
 S_FILES = vectors.S
 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
@@ -30,10 +31,11 @@ $(PGM): $(OBJS)
 $(PROJECT_INCLUDE)/bsp:
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bsp/vectors.h: vectors.h
+$(PROJECT_INCLUDE)/bsp/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp $(PROJECT_INCLUDE)/bsp/vectors.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp \
+   $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS)