diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-14 20:28:09 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-14 20:28:09 +0000 |
commit | 1d0ee80e4bf2ccba37ba219cfa3580da4483dbc3 (patch) | |
tree | 77a983805641ccd034cd18ae80f5f6942ef9ed2a /c/src/lib/libbsp/powerpc/mpc8260ads | |
parent | 2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-1d0ee80e4bf2ccba37ba219cfa3580da4483dbc3.tar.bz2 |
2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am: Rework to avoid .rel files.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mpc8260ads')
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 41 |
2 files changed, 16 insertions, 29 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index 30b8739aee..0e70b7ffc3 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,7 @@ +2008-05-14 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am: Rework to avoid .rel files. + 2008-05-12 Joel Sherrill <joel.sherrill@OARcorp.com> * startup/bspstart.c: Refactored and renamed initialization routines to diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index d901569f5b..432700858d 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -28,38 +28,20 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += pclock.rel -pclock_rel_SOURCES = clock/p_clock.c -pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +pclock_SOURCES = clock/p_clock.c +console_SOURCES = console/console.c include_bsp_HEADERS = irq/irq.h - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +irq_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S include_bsp_HEADERS += vectors/vectors.h - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c startup/cpuinit.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += vectors.rel -vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.h \ +vectors_SOURCES = vectors/vectors_init.c vectors/vectors.h \ vectors/vectors.S -vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -71,12 +53,10 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = pclock.rel irq.rel startup.rel console.rel vectors.rel -if HAS_NETWORKING -libbsp_a_LIBADD += network.rel -endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ +libbsp_a_SOURCES = $(pclock_SOURCES) $(irq_SOURCES) $(startup_SOURCES) \ + $(console_SOURCES) $(vectors_SOURCES) + +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/clock.rel \ @@ -85,6 +65,9 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel +if HAS_NETWORKING +libbsp_a_LIBADD += network.rel +endif EXTRA_DIST += times |