2002-11-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* mongoosev/Makefile.am: Merge-in mongoosev/include/Makefile.am.
	Install include/mongoose-v.h.
	* mongoosev/include/Makefile.am: Remove.
	* configure.ac: Reflect changes above.

c/src/lib/libcpu/mips/ChangeLog

@@ -1,3 +1,10 @@
+2002-11-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* mongoosev/Makefile.am: Merge-in mongoosev/include/Makefile.am.
+	Install include/mongoose-v.h.
+	* mongoosev/include/Makefile.am: Remove.
+	* configure.ac: Reflect changes above.
+
 2002-11-01	Joel Sherrill <joel@OARcorp.com>
 
 	* shared/interrupts/installisrentries.c,

c/src/lib/libcpu/mips/configure.ac

@@ -39,7 +39,6 @@ AC_CONFIG_FILES([Makefile
 clock/Makefile
 mongoosev/Makefile
 mongoosev/duart/Makefile
-mongoosev/include/Makefile
 mongoosev/vectorisrs/Makefile
 shared/Makefile
 shared/cache/Makefile

c/src/lib/libcpu/mips/mongoosev/Makefile.am

@@ -4,7 +4,21 @@
 
 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
 
-SUBDIRS = include duart vectorisrs
+SUBDIRS = duart vectorisrs
+
+include_mipsdir = $(includedir)/libcpu
+include_mips_HEADERS = include/mongoose-v.h
+
+$(PROJECT_INCLUDE)/libcpu:
+	$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/libcpu/%.h: include/%.h
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
+    $(include_mips_HEADERS:include/%.h=$(PROJECT_INCLUDE)/libcpu/%.h)
+
+all-local: $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../automake/local.am

c/src/lib/libcpu/mips/mongoosev/include/Makefile.am

@@ -1,21 +0,0 @@
-##
-## $Id$
-##
-
-
-H_FILES = mongoose-v.h
-
-$(PROJECT_INCLUDE)/libcpu:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/libcpu/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
-    $(H_FILES:%.h=$(PROJECT_INCLUDE)/libcpu/%.h)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = mongoose-v.h
-
-include $(top_srcdir)/../../../../../automake/local.am