2004-01-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Remove times from EXTRA_DIST (Non-existant).
	* startup/Makefile.am: Remove exit.c, setvec.c from EXTRA_DIST.
	* console/Makefile.am: Remove console.c from EXTRA_DIST.
	* wrapup/Makefile.am: Reflect changes to libcpu.

5 files changed, 11 insertions, 11 deletions

diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog
index b54e52e183..212da97f3a 100644
--- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog
+++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Remove times from EXTRA_DIST (Non-existant).
+	* startup/Makefile.am: Remove exit.c, setvec.c from EXTRA_DIST.
+	* console/Makefile.am: Remove console.c from EXTRA_DIST.
+	* wrapup/Makefile.am: Reflect changes to libcpu.
+
 2004-01-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES.
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index 043c8f68b4..b689f33ab6 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -14,8 +14,6 @@ nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
 
 all-local: $(PREINSTALL_FILES)
 
-EXTRA_DIST = times
-
 $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
diff --git a/c/src/lib/libbsp/mips/jmr3904/console/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/console/Makefile.am
index 9667c026e9..71895b5bf4 100644
--- a/c/src/lib/libbsp/mips/jmr3904/console/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/console/Makefile.am
@@ -27,6 +27,4 @@ all-local: $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
-EXTRA_DIST = console.c
-
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/mips/jmr3904/startup/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/startup/Makefile.am
index dc739e8da9..7c7925ad44 100644
--- a/c/src/lib/libbsp/mips/jmr3904/startup/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/startup/Makefile.am
@@ -28,7 +28,7 @@ project_lib_DATA = linkcmds
 
 all-local: $(PGM) $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bspclean.c bspstart.c exit.c linkcmds setvec.c
+EXTRA_DIST = bspclean.c bspstart.c linkcmds
 
 TMPINSTALL_FILES =
 
diff --git a/c/src/lib/libbsp/mips/jmr3904/wrapup/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/wrapup/Makefile.am
index c94f87969e..d15ec00df6 100644
--- a/c/src/lib/libbsp/mips/jmr3904/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/wrapup/Makefile.am
@@ -9,12 +9,9 @@ include $(top_srcdir)/../../../../automake/lib.am
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
-    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
-    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/tx39/*/$(ARCH)/*.$(OBJEXT)) \
-    $(wildcard \
-    ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \
-    $(foreach piece, $(GENERIC_FILES), \
-    ../../../$(piece)/$(ARCH)/$(piece).rel)
+    ../../../../libcpu/mips/shared/cache$(LIB_VARIANT).rel \
+    ../../../../libcpu/mips/shared/interrupts$(LIB_VARIANT).rel \
+    ../../../../libcpu/mips/tx39/vectorisrs$(LIB_VARIANT).rel
 
 $(ARCH)/libbsp.a: ${OBJS}
 	$(make-library)