2005-05-10 Ralf Corsepius <ralf.corsepius@rtems.org>

* preinstall.am: New.
	* Makefile.am: Merge in au1x00/Makefile.am, mongoosev/Makefile.am,
	r46xx/Makefile.am, shared/Makefile.am.
	Include preinstall.am.
	* au1x00/Makefile.am, mongoosev/Makefile.am,
        r46xx/Makefile.am, shared/Makefile.am: Remove.
	* configure.ac: Reflect changes above.

c/src/lib/libcpu/mips/ChangeLog

@@ -1,3 +1,13 @@
+2005-05-10	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* preinstall.am: New.
+	* Makefile.am: Merge in au1x00/Makefile.am, mongoosev/Makefile.am,
+	r46xx/Makefile.am, tx39/Makefile.am, shared/Makefile.am.
+	Include preinstall.am.
+	* au1x00/Makefile.am, mongoosev/Makefile.am,
+        r46xx/Makefile.am, tx39/Makefile.am, shared/Makefile.am: Remove.
+	* configure.ac: Reflect changes above.
+
 2005-05-10	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* au1x00/vectorisrs/vectorisrs.c: Eliminate unsigned32.

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

@@ -4,7 +4,108 @@
 
 ACLOCAL_AMFLAGS = -I ../../../aclocal
 
-SUBDIRS = shared mongoosev tx39 r46xx au1x00
+include $(top_srcdir)/../../../automake/compile.am
+
+CLEANFILES =
+DISTCLEANFILES =
+EXTRA_DIST =
+
+noinst_PROGRAMS =
+
+## cache
+include_libcpudir = $(includedir)/libcpu
+
+include_libcpu_HEADERS = ../shared/include/cache.h
+
+noinst_PROGRAMS += shared/cache.rel
+shared_cache_rel_SOURCES = shared/cache/cache.c ../shared/src/cache_aligned_malloc.c \
+    ../shared/src/cache_manager.c shared/cache/cache_.h
+shared_cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache
+shared_cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+## interrupts
+
+if tx39
+interrupts_CPPFLAGS = -DTX39
+endif
+
+if mongoosev
+interrupts_CPPFLAGS = -DMONGOOSEV
+endif
+
+noinst_PROGRAMS += shared/interrupts.rel
+shared_interrupts_rel_SOURCES = shared/interrupts/installisrentries.c \
+    shared/interrupts/vectorexceptions.c shared/interrupts/isr_entries.S
+shared_interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) $(interrupts_CPPFLAGS)
+shared_interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+if mongoosev
+include_libcpu_HEADERS += mongoosev/include/mongoose-v.h
+
+## mongoosev/duart
+include_libchipdir = $(includedir)/libchip
+include_libchip_HEADERS = mongoosev/duart/mg5uart.h
+
+EXTRA_DIST += mongoosev/duart/README.mguart
+
+noinst_PROGRAMS += mongoosev/duart.rel
+mongoosev_duart_rel_SOURCES = mongoosev/duart/mg5uart.c \
+    mongoosev/duart/mg5uart.h mongoosev/duart/mg5uart_reg.c
+mongoosev_duart_rel_CPPFLAGS = $(AM_CPPFLAGS)
+mongoosev_duart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+## mongoosev/vectorisrs
+
+noinst_PROGRAMS += mongoosev/vectorisrs.rel
+mongoosev_vectorisrs_rel_SOURCES = mongoosev/vectorisrs/maxvectors.c \
+   mongoosev/vectorisrs/vectorisrs.c
+mongoosev_vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS)
+mongoosev_vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+endif
+
+if tx39
+include_libcpu_HEADERS += tx39/include/tx3904.h
+
+noinst_PROGRAMS += tx39/vectorisrs.rel
+tx39_vectorisrs_rel_SOURCES = tx39/vectorisrs/maxvectors.c tx39/vectorisrs/vectorisrs.c
+tx39_vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS)
+tx39_vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+endif
+
+if au1x00
+include_libcpu_HEADERS += au1x00/include/au1x00.h
+
+noinst_PROGRAMS += au1x00/vectorisrs.rel
+au1x00_vectorisrs_rel_SOURCES = au1x00/vectorisrs/maxvectors.c \
+  au1x00/vectorisrs/vectorisrs.c
+au1x00_vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+au1x00_vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+endif
+
+if r46xx
+noinst_PROGRAMS += r46xx/vectorisrs.rel
+r46xx_vectorisrs_rel_SOURCES = r46xx/vectorisrs/maxvectors.c \
+   r46xx/vectorisrs/vectorisrs.c
+r46xx_vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS)
+r46xx_vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+endif
+
+if r46xx
+noinst_PROGRAMS += r46xx/timer.rel
+r46xx_timer_rel_SOURCES = timer/timer.c timer/gettime.S
+r46xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
+r46xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+endif
+
+if r46xx
+noinst_PROGRAMS += r46xx/clock.rel
+r46xx_clock_rel_SOURCES = clock/ckinit.c clock/clock.S clock/clock.h
+r46xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
+r46xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+endif
+
+all-local: $(PREINSTALL_FILES)
+
+include $(srcdir)/preinstall.am
 
-include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am

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

@@ -32,12 +32,11 @@ AM_CONDITIONAL(mongoosev, test "$RTEMS_CPU_MODEL" = "mongoosev")
 
 AM_CONDITIONAL(au1x00, test "$RTEMS_CPU_MODEL" = "au1x00")
 
+AC_PATH_PROG([AMPOLISH3],[ampolish3],[])
+AM_CONDITIONAL([AMPOLISH3],[test x"$USE_MAINTAINER_MODE" = x"yes" \
+  && test -n "$AMPOLISH3"])
+
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
-au1x00/Makefile
-mongoosev/Makefile
-shared/Makefile
-r46xx/Makefile
-tx39/Makefile
 ])
 AC_OUTPUT