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/unix/posix | |
| 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/unix/posix')
| -rw-r--r-- | c/src/lib/libbsp/unix/posix/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/unix/posix/Makefile.am | 37 |
2 files changed, 12 insertions, 29 deletions
diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog index b33f00392f..4c101e9592 100644 --- a/c/src/lib/libbsp/unix/posix/ChangeLog +++ b/c/src/lib/libbsp/unix/posix/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/unix/posix/Makefile.am b/c/src/lib/libbsp/unix/posix/Makefile.am index ad9ff71543..0e5c9c5b97 100644 --- a/c/src/lib/libbsp/unix/posix/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/Makefile.am @@ -39,50 +39,29 @@ noinst_LIBRARIES = ## project_lib_DATA += rtems-ctor.$(OBJEXT) ## endif -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c startup/bspstart.c \ startup/setvec.c ../../shared/bootcard.c ## for now always using main.c style startup ##if !HAS_CXX -startup_rel_SOURCES += startup/main.c +startup_SOURCES += startup/main.c ##endif -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = clock/clock.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c console/console-io.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += timer.rel -timer_rel_SOURCES = timer/timer.c -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +clock_SOURCES = clock/clock.c +console_SOURCES = console/console.c console/console-io.c +timer_SOURCES = timer/timer.c if HAS_MP -noinst_PROGRAMS += shmsupp.rel -shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c \ +shmsupp_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c \ shmsupp/cause_intr.c shmsupp/lock.c shmsupp/mpisr.c -shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) -shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES += libbsp.a -libbsp_a_SOURCES = +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) \ + $(console_SOURCES) $(timer_SOURCES) $(shmsupp_SOURCES) ## if HAS_CXX ## libbsp_a_SOURCES += startup/rtems-ctor.cc ## endif -libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel -if HAS_MP -libbsp_a_LIBADD += shmsupp.rel -endif EXTRA_DIST = times |