From 64eb0c7f4269504e45e73cee0aa4320f9e5ecedf Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 29 Sep 2008 10:19:37 +0000
Subject: =?UTF-8?q?2008-09-29=09Ralf=20Cors=C3=A9pius=20<ralf.corsepius@rt?=
 =?UTF-8?q?ems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* Makefile.am: Eliminate *_SOURCES.
---
 c/src/lib/libbsp/unix/posix/ChangeLog   |  4 ++++
 c/src/lib/libbsp/unix/posix/Makefile.am | 42 ++++++++++-----------------------
 2 files changed, 17 insertions(+), 29 deletions(-)

(limited to 'c/src/lib/libbsp/unix/posix')

diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog
index cab57e832c..777bc5d179 100644
--- a/c/src/lib/libbsp/unix/posix/ChangeLog
+++ b/c/src/lib/libbsp/unix/posix/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Eliminate *_SOURCES.
+
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Remove noinst_PROGRAMS (Unused).
diff --git a/c/src/lib/libbsp/unix/posix/Makefile.am b/c/src/lib/libbsp/unix/posix/Makefile.am
index 9bbc4bd759..979d22c8e4 100644
--- a/c/src/lib/libbsp/unix/posix/Makefile.am
+++ b/c/src/lib/libbsp/unix/posix/Makefile.am
@@ -27,45 +27,29 @@ DISTCLEANFILES = include/bspopts.h
 nodist_include_HEADERS += ../../shared/include/coverhd.h
 
 project_lib_DATA =
-noinst_LIBRARIES =
-## if HAS_CXX
-## noinst_LIBRARIES += librtemscxx.a
-## 
-## librtemscxx_a_SOURCES = startup/no-ctor.c
-## 
-## # Install as a separate .$(OBJEXT)
-## project_lib_DATA += no-ctor.$(OBJEXT)
-## 
-## # We install the RTEMS constructor as a separate .$(OBJEXT)
-## # so it can be easily place correctly by the compiler config file.
-## project_lib_DATA += rtems-ctor.$(OBJEXT)
-## endif
+noinst_LIBRARIES = libbsp.a
+libbsp_a_SOURCES =
 
-startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
+# startup
+libbsp_a_SOURCES += startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \
     startup/bspstart.c startup/bsppost.c startup/bspgetworkarea.c \
     startup/setvec.c ../../shared/bootcard.c
-## for now always using main.c style startup
-##if !HAS_CXX
-startup_SOURCES += startup/main.c
-##endif
+libbsp_a_SOURCES += startup/main.c
 
-clock_SOURCES = clock/clock.c
-console_SOURCES = console/console.c console/console-io.c
-timer_SOURCES = timer/timer.c
+# clock
+libbsp_a_SOURCES += clock/clock.c
+# console
+libbsp_a_SOURCES += console/console.c console/console-io.c
+# timer
+libbsp_a_SOURCES += timer/timer.c
 
 if HAS_MP
-shmsupp_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c \
+# shmsupp
+libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c \
     shmsupp/cause_intr.c shmsupp/lock.c shmsupp/mpisr.c
 endif
 
-noinst_LIBRARIES += libbsp.a
-libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) \
-    $(console_SOURCES) $(timer_SOURCES) $(shmsupp_SOURCES)
-## if HAS_CXX
-## libbsp_a_SOURCES += startup/rtems-ctor.cc
-## endif
-
 EXTRA_DIST = times
 
 include $(srcdir)/preinstall.am
-- 
cgit v1.2.3