2003-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* io/.cvsignore: Remove.
	* pci/Makefile.am, irq/Makefile.am, io/Makefile.am,
	comm/Makefile.am: Remove.
	* Makefile.am: Merge-in Makefile.ams above.
	Add preinstallation dirstamp support.

7 files changed, 62 insertions, 82 deletions

diff --git a/c/src/lib/libbsp/i386/shared/ChangeLog b/c/src/lib/libbsp/i386/shared/ChangeLog
index a9eaa59bd1..76d0b2e340 100644
--- a/c/src/lib/libbsp/i386/shared/ChangeLog
+++ b/c/src/lib/libbsp/i386/shared/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* io/.cvsignore: Remove.
+	* pci/Makefile.am, irq/Makefile.am, io/Makefile.am,
+	comm/Makefile.am: Remove.
+	* Makefile.am: Merge-in Makefile.ams above.
+	Add preinstallation dirstamp support.
+
 2003-10-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* comm/uart.h: Add extern "C" guards.
diff --git a/c/src/lib/libbsp/i386/shared/Makefile.am b/c/src/lib/libbsp/i386/shared/Makefile.am
index d369b2e339..04154041c4 100644
--- a/c/src/lib/libbsp/i386/shared/Makefile.am
+++ b/c/src/lib/libbsp/i386/shared/Makefile.am
@@ -2,8 +2,60 @@
 ## $Id$
 ##
 
+include_HEADERS =
+EXTRA_DIST =
 
-SUBDIRS = irq io comm pci
+# comm
+include_HEADERS += comm/uart.h comm/tty_drv.h comm/i386_io.h
+
+EXTRA_DIST += comm/i386-stub-glue.c comm/i386-stub.c comm/uart.c \
+    comm/tty_drv.c comm/gdb_glue.c
+
+EXTRA_DIST += comm/GDB.HOWTO
+
+# irq
+include_HEADERS += irq/irq.h irq/irq_asm.h
+
+EXTRA_DIST += irq/idt.c irq/irq.c irq/irq_init.c
+EXTRA_DIST += irq/irq_asm.S
+
+# pci
+include_HEADERS += pci/pcibios.h
+
+EXTRA_DIST += pci/pcibios.c
+
+# ---
+all-local: $(PREINSTALL_FILES)
+
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/uart.h: comm/uart.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/uart.h
+
+$(PROJECT_INCLUDE)/tty_drv.h: comm/tty_drv.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tty_drv.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/tty_drv.h
+
+$(PROJECT_INCLUDE)/i386_io.h: comm/i386_io.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i386_io.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/i386_io.h
+
+$(PROJECT_INCLUDE)/irq.h: irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h
+
+$(PROJECT_INCLUDE)/irq_asm.h: irq/irq_asm.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq_asm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq_asm.h
+
+$(PROJECT_INCLUDE)/pcibios.h: pci/pcibios.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pcibios.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/pcibios.h
 
-include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/shared/comm/Makefile.am b/c/src/lib/libbsp/i386/shared/comm/Makefile.am
deleted file mode 100644
index bd49291cd6..0000000000
--- a/c/src/lib/libbsp/i386/shared/comm/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = uart.h tty_drv.h i386_io.h
-
-C_FILES = i386-stub-glue.c i386-stub.c uart.c tty_drv.c gdb_glue.c
-
-noinst_DATA = GDB.HOWTO
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = GDB.HOWTO i386-stub-glue.c i386-stub.c uart.c uart.h tty_drv.h \
-    i386_io.h tty_drv.c gdb_glue.c
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/shared/io/.cvsignore b/c/src/lib/libbsp/i386/shared/io/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/i386/shared/io/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/c/src/lib/libbsp/i386/shared/io/Makefile.am b/c/src/lib/libbsp/i386/shared/io/Makefile.am
deleted file mode 100644
index 164081cf05..0000000000
--- a/c/src/lib/libbsp/i386/shared/io/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-##
-## $Id$
-##
-
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/shared/irq/Makefile.am b/c/src/lib/libbsp/i386/shared/irq/Makefile.am
deleted file mode 100644
index 38ff1612e6..0000000000
--- a/c/src/lib/libbsp/i386/shared/irq/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = irq.h irq_asm.h
-
-C_FILES = idt.c irq.c irq_init.c
-S_FILES = irq_asm.S
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = idt.c irq.c irq_asm.S irq_init.c
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/shared/pci/Makefile.am b/c/src/lib/libbsp/i386/shared/pci/Makefile.am
deleted file mode 100644
index dbae5e9ffd..0000000000
--- a/c/src/lib/libbsp/i386/shared/pci/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = pcibios.h
-
-C_FILES = pcibios.c
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = pcibios.c
-
-include $(top_srcdir)/../../../automake/local.am