2007-03-28 Joel Sherrill <joel@OARcorp.com>

	* Makefile.am: Modify to avoid pulling in too much into minimum
	executable.

4 files changed, 46 insertions, 5 deletions

diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog
index cd94ede9a4..d5fb63becd 100644
--- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog
+++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-28	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Modify to avoid pulling in too much into minimum
+	executable.
+
 2006-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: New BUG-REPORT address.
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index cf2b65fd3f..b751672cca 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -34,11 +34,18 @@ clock_rel_SOURCES = clock/clockdrv.c
 clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
 clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+## Bulk of Console driver with dependencies that entails
 noinst_PROGRAMS += console.rel
-console_rel_SOURCES = console/console-io.c ../../shared/console-polled.c
+console_rel_SOURCES = ../../shared/console-polled.c
 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+## used for debug IO and bottom of console polled
+noinst_PROGRAMS += consoleio.rel
+consoleio_rel_SOURCES = console/console-io.c
+consoleio_rel_CPPFLAGS = $(AM_CPPFLAGS)
+consoleio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
 noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
@@ -54,10 +61,19 @@ timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
+libbsp_a_LIBADD = clock.rel console.rel consoleio.rel timer.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \
     ../../../libcpu/@RTEMS_CPU@/tx39/vectorisrs.rel
+libbsp_a_LIBADD += \
+    startup_rel-bspclean.o \
+    startup_rel-bsplibc.o \
+    startup_rel-bsppost.o \
+    startup_rel-bspstart.o \
+    startup_rel-bootcard.o \
+    startup_rel-sbrk.o \
+    startup_rel-gnatinstallhandler.o \
+    startup_rel-setvec.o
 
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog
index 98a3d7e63f..5b5d2bc5bb 100644
--- a/c/src/lib/libbsp/powerpc/psim/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-28	Joel Sherrill <joel@OARcorp.com>
+
+	* Makefile.am: Modify to avoid pulling in too much into minimum
+	executable.
+
 2006-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: New BUG-REPORT address.
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 3c3505bb31..859a8637fc 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -50,12 +50,18 @@ pclock_rel_SOURCES = ../shared/clock/p_clock.c
 pclock_rel_CPPFLAGS = $(AM_CPPFLAGS)
 pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+## Bulk of Console driver with dependencies that entails
 noinst_PROGRAMS += console.rel
-console_rel_SOURCES = console/console-io.c console/consupp.S \
-    ../../shared/console-polled.c
+console_rel_SOURCES = ../../shared/console-polled.c
 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
+## used for debug IO and bottom of console polled
+noinst_PROGRAMS += consoleio.rel
+consoleio_rel_SOURCES = console/console-io.c console/consupp.S
+consoleio_rel_CPPFLAGS = $(AM_CPPFLAGS)
+consoleio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
 include_bsp_HEADERS = irq/irq.h
 
 noinst_PROGRAMS += irq.rel
@@ -85,7 +91,7 @@ endif
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel pclock.rel console.rel irq.rel vectors.rel
+libbsp_a_LIBADD = pclock.rel consoleio.rel console.rel irq.rel vectors.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
@@ -94,6 +100,15 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
 
+libbsp_a_LIBADD += \
+startup_rel-bspclean.o \
+startup_rel-bsplibc.o \
+startup_rel-bsppost.o \
+startup_rel-bspstart.o \
+startup_rel-bootcard.o \
+startup_rel-sbrk.o \
+startup_rel-gnatinstallhandler.o
+
 if HAS_MP
 libbsp_a_LIBADD += shmsupp.rel
 endif