2008-04-17 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am: Do not use intermediate .rel files unless from libcpu or
	a network driver. This simplifies the Makefile.am and avoids pulling
	in unneeded code.

2 files changed, 21 insertions, 54 deletions

diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog
index 83c2fbb3f6..c7cb607c8d 100644
--- a/c/src/lib/libbsp/powerpc/psim/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-17	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am: Do not use intermediate .rel files unless from libcpu or
+	a network driver. This simplifies the Makefile.am and avoids pulling
+	in unneeded code.
+
 2008-03-03	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/linkcmds: Add wildcard to gcc_except_table section so
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index cefff023d2..78c1c09c40 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -37,44 +37,22 @@ project_lib_DATA += rtems_crti.$(OBJEXT)
 
 dist_project_lib_DATA += startup/linkcmds
 
-noinst_PROGRAMS += startup.rel
-startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
+noinst_LIBRARIES = libbsp.a
+
+startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
+    startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
     startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
-startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
-startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_PROGRAMS += pclock.rel
-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 = ../../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)
+pclock_SOURCES = ../shared/clock/p_clock.c
+console_SOURCES = ../../shared/console-polled.c
+debugio_SOURCES = console/console-io.c console/consupp.S
 
 include_bsp_HEADERS = irq/irq.h
-
-noinst_PROGRAMS += irq.rel
-irq_rel_SOURCES = irq/irq_init.c irq/no_pic.c
-irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
-irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+irq_SOURCES = irq/irq_init.c irq/no_pic.c
 
 EXTRA_DIST += vectors/README
-
-noinst_PROGRAMS += vectors.rel
-vectors_rel_SOURCES = vectors/align_h.S
-vectors_rel_CPPFLAGS = $(AM_CPPFLAGS)
-vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+vectors_SOURCES = vectors/align_h.S
 
 include_bsp_HEADERS += \
 	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h	\
@@ -84,17 +62,14 @@ include_bsp_HEADERS += \
 if HAS_MP
 EXTRA_DIST += shmsupp/README
 
-noinst_PROGRAMS += shmsupp.rel
-shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
-    shmsupp/mpisr.c
-shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS)
-shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+shmdr_SOURCES = \
+    shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c shmsupp/mpisr.c
 endif
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
-libbsp_a_LIBADD = pclock.rel consoleio.rel console.rel irq.rel vectors.rel
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
+libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \
+    $(debugio_SOURCES) $(irq_SOURCES) $(vectors_SOURCES) $(shmdr_SOURCES)
+
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
     ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
     ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
@@ -104,19 +79,5 @@ 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-bsppredriverhook.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
-
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am