2003-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* mongoosev/Makefile.am: Rework preinstall rules.
	* mongoosev/duart/Makefile.am: Rework preinstall rules.
	* tx39/include/Makefile.am: Remove.
	* tx39/Makefile.am: Merge-in tx39/include/Makefile.am.
	* configure.ac: Remove tx39/include/Makefile.

6 files changed, 45 insertions, 45 deletions

diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog
index effa83e292..31a430a29a 100644
--- a/c/src/lib/libcpu/mips/ChangeLog
+++ b/c/src/lib/libcpu/mips/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* mongoosev/Makefile.am: Rework preinstall rules.
+	* mongoosev/duart/Makefile.am: Rework preinstall rules.
+	* tx39/include/Makefile.am: Remove.
+	* tx39/Makefile.am: Merge-in tx39/include/Makefile.am.
+	* configure.ac: Remove tx39/include/Makefile.
+
 2003-10-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/c/src/lib/libcpu/mips/configure.ac b/c/src/lib/libcpu/mips/configure.ac
index a506a5a5f5..5df2297a98 100644
--- a/c/src/lib/libcpu/mips/configure.ac
+++ b/c/src/lib/libcpu/mips/configure.ac
@@ -15,7 +15,6 @@ AM_MAINTAINER_MODE
 RTEMS_ENABLE_BARE
 RTEMS_ENV_RTEMSBSP
 
-
 RTEMS_PROJECT_ROOT
 
 RTEMS_PROG_CC_FOR_TARGET
@@ -44,7 +43,6 @@ r46xx/Makefile
 r46xx/vectorisrs/Makefile
 timer/Makefile
 tx39/Makefile
-tx39/include/Makefile
 tx39/vectorisrs/Makefile
 ])
 AC_OUTPUT
diff --git a/c/src/lib/libcpu/mips/mongoosev/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
index 4c4246b787..5f53303f2b 100644
--- a/c/src/lib/libcpu/mips/mongoosev/Makefile.am
+++ b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
@@ -9,16 +9,17 @@ SUBDIRS = duart vectorisrs
 include_mipsdir = $(includedir)/libcpu
 include_mips_HEADERS = include/mongoose-v.h
 
-$(PROJECT_INCLUDE)/libcpu:
-	$(mkinstalldirs) $@
+all-local: $(PREINSTALL_FILES)
 
-$(PROJECT_INCLUDE)/libcpu/%.h: include/%.h
-	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES =
 
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
-    $(include_mips_HEADERS:include/%.h=$(PROJECT_INCLUDE)/libcpu/%.h)
+$(PROJECT_INCLUDE)/libcpu:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu
 
-all-local: $(PREINSTALL_FILES)
+$(PROJECT_INCLUDE)/libcpu/mongoose-v.h: include/mongoose-v.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mongoose-v.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am
index 3accaa54d2..c3b199a1e3 100644
--- a/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am
+++ b/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/mg5uart.rel
 
 C_FILES = mg5uart.c mg5uart_reg.c
@@ -12,11 +11,6 @@ mg5uart_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/libchip:
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/libchip/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -24,16 +18,23 @@ $(PROJECT_INCLUDE)/libchip/%.h: %.h
 $(PGM): $(mg5uart_rel_OBJECTS)
 	$(make-rel)
 
-## include_libchip_HEADERS = mg5uart.h
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \
-       $(PROJECT_INCLUDE)/libchip/mg5uart.h
+include_libchipdir = $(includedir)/libchip
+include_libchip_HEADERS = mg5uart.h
 
-##    $(include_libchip_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
 all-local: $(ARCH) $(PREINSTALL_FILES) $(mg5uart_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
-EXTRA_DIST = mg5uart.c README.mguart mg5uart.c mg5uart.h mg5uart_reg.c
+EXTRA_DIST = mg5uart.c README.mguart mg5uart.c mg5uart_reg.c
+
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/libchip:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip
+
+$(PROJECT_INCLUDE)/libchip/mg5uart.h: mg5uart.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/tx39/Makefile.am b/c/src/lib/libcpu/mips/tx39/Makefile.am
index 56f18eba68..7cc324119b 100644
--- a/c/src/lib/libcpu/mips/tx39/Makefile.am
+++ b/c/src/lib/libcpu/mips/tx39/Makefile.am
@@ -4,7 +4,22 @@
 
 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
 
-SUBDIRS = include vectorisrs
+SUBDIRS = . vectorisrs
+
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS = include/tx3904.h
+
+all-local: $(PREINSTALL_FILES)
+
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/libcpu:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu
+
+$(PROJECT_INCLUDE)/libcpu/tx3904.h: include/tx3904.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/tx39/include/Makefile.am b/c/src/lib/libcpu/mips/tx39/include/Makefile.am
deleted file mode 100644
index 06b812a035..0000000000
--- a/c/src/lib/libcpu/mips/tx39/include/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-##
-## $Id$
-##
-
-
-include_libcpudir = $(includedir)/libcpu
-
-include_libcpu_HEADERS = tx3904.h
-
-$(PROJECT_INCLUDE)/libcpu:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/libcpu/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
-    $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = tx3904.h
-
-include $(top_srcdir)/../../../automake/local.am