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

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

1 files changed, 18 insertions, 37 deletions

diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 5ac8822ff9..1b9e216fc8 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -28,40 +28,24 @@ 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 \
+startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.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 += dlentry.rel
-dlentry_rel_SOURCES = dlentry/dlentry.S
-dlentry_rel_CPPFLAGS = $(AM_CPPFLAGS)
-dlentry_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+dlentry_SOURCES = dlentry/dlentry.S
 
-include_bsp_HEADERS = ../../powerpc/shared/console/uart.h
-include_bsp_HEADERS += ../../powerpc/shared/console/consoleIo.h
-
-noinst_PROGRAMS += console.rel
-console_rel_SOURCES = ../../powerpc/shared/console/uart.c \
+include_bsp_HEADERS = ../../powerpc/shared/console/uart.h \
+    ../../powerpc/shared/console/consoleIo.h
+console_SOURCES = ../../powerpc/shared/console/uart.c \
     ../../powerpc/shared/console/console.c
-console_rel_CPPFLAGS = $(AM_CPPFLAGS)
-console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 include_bsp_HEADERS += irq/irq.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
-
-noinst_PROGRAMS += irq.rel
-irq_rel_SOURCES = irq/irq_init.c irq/irq.c
-irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
-irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
 
+irq_SOURCES = irq/irq_init.c irq/irq.c
 
 ## if HAS_NETWORKING
 ## network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
@@ -71,25 +55,22 @@ irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 ## network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 ## endif
 
-
 noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+libbsp_a_SOURCES = $(startup_SOURCES) $(dlentry_SOURCES) $(console_SOURCES) \
+    $(irq_SOURCES)
 
-libbsp_a_LIBADD = startup.rel dlentry.rel console.rel irq.rel
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
+    ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
+    ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel 
 
 ## if HAS_NETWORKING
 ## libbsp_a_LIBADD += network.rel
 ## endif
 
-libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
-	../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \
-	../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
-	../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
-	../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel 
-
-
 EXTRA_DIST += times
 
 include $(srcdir)/preinstall.am