2008-07-31 Joel Sherrill <joel.sherrill@OARcorp.com>

	* Makefile.am: Do not build .rel files. Reduces code bloat.

1 files changed, 35 insertions, 48 deletions

diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index df9d507b0a..3908cadf6c 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -11,6 +11,8 @@ libcpudir = ../../../libcpu/@RTEMS_CPU@
 
 DISTCLEANFILES = include/bspopts.h
 
+noinst_PROGRAMS =
+
 # Compiler specs
 dist_project_lib_DATA = bsp_specs
 
@@ -34,55 +36,20 @@ include_HEADERS = include/bsp.h
 nodist_include_HEADERS = include/bspopts.h ../../shared/tod.h
 include_bspdir = $(includedir)/bsp
 include_bsp_HEADERS = include/mpc55xxevb.h \
-	include/irq-config.h \
-	../../shared/include/irq-generic.h \
-	../shared/include/tictac.h
+    include/irq-config.h \
+    ../../shared/include/irq-generic.h \
+    ../shared/include/tictac.h
 
-# BSP library
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
-libbsp_a_LIBADD = $(libcpudir)/shared/cpuIdent.rel \
-	$(libcpudir)/shared/cache.rel \
-	$(libcpudir)/shared/stack.rel \
-	$(libcpudir)/@RTEMS_CPU_MODEL@/misc.rel \
-	$(libcpudir)/@RTEMS_CPU_MODEL@/irq.rel \
-	$(libcpudir)/@RTEMS_CPU_MODEL@/edma.rel \
-	$(libcpudir)/@RTEMS_CPU_MODEL@/dspi.rel \
-	$(libcpudir)/@RTEMS_CPU_MODEL@/esci.rel \
-	$(libcpudir)/@exceptions@/rtems-cpu.rel \
-	$(libcpudir)/@exceptions@/raw_exception.rel \
-	$(libcpudir)/@exceptions@/exc_bspsupport.rel
-
-# Startup
-noinst_PROGRAMS = startup.rel
-startup_rel_SOURCES = ../../shared/bsplibc.c \
-	../../shared/bsppost.c \
-	../../shared/bootcard.c \
-	../shared/src/tictac.c \
-	startup/bspclean.c \
-	startup/bspstart.c
-startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-libbsp_a_LIBADD += startup.rel
-
-# Clock
-noinst_PROGRAMS += clock.rel
-clock_rel_SOURCES = ../shared/clock/clock.c
-clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-libbsp_a_LIBADD += clock.rel
-
-# IRQ
-noinst_PROGRAMS += irq-generic.rel
-irq_generic_rel_SOURCES = ../../shared/src/irq-generic.c \
-	../../shared/src/irq-legacy.c
-irq_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-libbsp_a_LIBADD += irq-generic.rel
-
-# Tests
-noinst_PROGRAMS += tests.rel
-tests_rel_SOURCES = tests/tests.c \
-	startup/sd-card-init.c
-tests_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-libbsp_a_LIBADD += tests.rel
+startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
+    ../../shared/bootcard.c ../shared/src/tictac.c startup/bspclean.c \
+    startup/bspstart.c
+
+clock_SOURCES = ../shared/clock/clock.c
+
+irq_generic_SOURCES = ../../shared/src/irq-generic.c \
+    ../../shared/src/irq-legacy.c
+
+tests_SOURCES = tests/tests.c startup/sd-card-init.c
 
 # Network
 if HAS_NETWORKING
@@ -90,6 +57,26 @@ noinst_PROGRAMS += network.rel
 network_rel_SOURCES = network/network.c
 network_rel_CPPFLAGS = $(AM_CPPFLAGS) -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -D__BSD_VISIBLE
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+endif
+
+# BSP library
+noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(irq_generic_SOURCES) \
+    $(tests_SOURCES)
+
+libbsp_a_LIBADD = $(libcpudir)/shared/cpuIdent.rel \
+    $(libcpudir)/shared/cache.rel \
+    $(libcpudir)/shared/stack.rel \
+    $(libcpudir)/@RTEMS_CPU_MODEL@/misc.rel \
+    $(libcpudir)/@RTEMS_CPU_MODEL@/irq.rel \
+    $(libcpudir)/@RTEMS_CPU_MODEL@/edma.rel \
+    $(libcpudir)/@RTEMS_CPU_MODEL@/dspi.rel \
+    $(libcpudir)/@RTEMS_CPU_MODEL@/esci.rel \
+    $(libcpudir)/@exceptions@/rtems-cpu.rel \
+    $(libcpudir)/@exceptions@/raw_exception.rel \
+    $(libcpudir)/@exceptions@/exc_bspsupport.rel
+
+if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif