Changeset 1d7f37b3 in rtems

Timestamp:

01/22/05 10:26:57 (19 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

0edbe88

Parents:

f68b890

Message:

2005-01-22 Ralf Corsepius <ralf.corsepius@…>

• Makefile.am: Merge rtems-ctor.o into libbsp.a. Fix building rtems-ctor.o and no-ctor.o.

Location:

c/src/lib/libbsp/unix/posix

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (3 diffs)

c/src/lib/libbsp/unix/posix/ChangeLog

@@ +1 @@
+2005-01-22      Ralf Corsepius <ralf.corsepius@rtems.org>
+
+        * Makefile.am: Merge rtems-ctor.o into libbsp.a.
+        Fix building rtems-ctor.o and no-ctor.o.
+
 2005-01-07      Ralf Corsepius <ralf.corsepius@rtems.org>
 

c/src/lib/libbsp/unix/posix/Makefile.am

@@ -29 +29 @@
 
 if HAS_CXX
-# FIXME: libno-ctor ??
+EXTRA_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.
-rtems-ctor.$(OBJEXT): startup/rtems-ctor.cc
-        ${CXXCOMPILE} -o $@ -c $<
 project_lib_DATA += rtems-ctor.$(OBJEXT)
-
-no-ctor.$(OBJEXT): startup/no-ctor.cc
-        ${CXXCOMPILE} -o $@ -c $<
-
-project_lib_DATA += no-ctor.$(OBJEXT)
 endif
 
@@ -78 +76 @@
 noinst_LIBRARIES = libbsp.a
 libbsp_a_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
@@ -122 +123 @@
 
 if HAS_CXX
+$(PROJECT_LIB)/no-ctor.$(OBJEXT): no-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+        $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor.$(OBJEXT)
+
 $(PROJECT_LIB)/rtems-ctor.$(OBJEXT): rtems-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
         $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems-ctor.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/rtems-ctor.$(OBJEXT)
-
-$(PROJECT_LIB)/no-ctor.$(OBJEXT): no-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-        $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor.$(OBJEXT)
 endif