summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-11-02 14:33:39 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-11-02 14:33:39 +0000
commitff118d4bdc2a3370dd252bc07385bada53b87c4b (patch)
tree145e5daa289daf724efb918e4a3146652ce96ad8
parentcf0bf016874de1c62340547bda6ee4b7ace8bac6 (diff)
downloadrtems-ff118d4bdc2a3370dd252bc07385bada53b87c4b.tar.bz2
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.
-rw-r--r--c/src/lib/libcpu/mips/ChangeLog7
-rw-r--r--c/src/lib/libcpu/mips/configure.ac1
-rw-r--r--c/src/lib/libcpu/mips/mongoosev/Makefile.am16
-rw-r--r--c/src/lib/libcpu/mips/mongoosev/include/Makefile.am21
4 files changed, 22 insertions, 23 deletions
diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog
index 8a08441feb..e3f27bfb0b 100644
--- a/c/src/lib/libcpu/mips/ChangeLog
+++ b/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,
diff --git a/c/src/lib/libcpu/mips/configure.ac b/c/src/lib/libcpu/mips/configure.ac
index 7df3879629..121a52287e 100644
--- a/c/src/lib/libcpu/mips/configure.ac
+++ b/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
diff --git a/c/src/lib/libcpu/mips/mongoosev/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
index b34b2d28b3..911dc51ee8 100644
--- a/c/src/lib/libcpu/mips/mongoosev/Makefile.am
+++ b/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
diff --git a/c/src/lib/libcpu/mips/mongoosev/include/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/include/Makefile.am
deleted file mode 100644
index e29bef1726..0000000000
--- a/c/src/lib/libcpu/mips/mongoosev/include/Makefile.am
+++ /dev/null
@@ -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