RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* Makefile.am: Merge rtems-ctor.o into libbsp.a.
	Fix building rtems-ctor.o and no-ctor.o.
This commit is contained in:
Ralf Corsepius
2005-01-22 10:26:57 +00:00
parent f68b8909b6
commit 1d7f37b3a7
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/unix/posix/ChangeLog
View File

@@ -1,3 +1,8 @@
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> 2005-01-07 Ralf Corsepius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V. * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.

25
c/src/lib/libbsp/unix/posix/Makefile.am
View File

@@ -28,18 +28,16 @@ nodist_include_HEADERS += ../../shared/include/coverhd.h
project_lib_DATA = project_lib_DATA =
if HAS_CXX 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) # We install the RTEMS constructor as a separate .$(OBJEXT)
# so it can be easily place correctly by the compiler config file. # 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) project_lib_DATA += rtems-ctor.$(OBJEXT)
no-ctor.$(OBJEXT): startup/no-ctor.cc
${CXXCOMPILE} -o $@ -c $<
project_lib_DATA += no-ctor.$(OBJEXT)
endif endif
noinst_PROGRAMS += startup.rel noinst_PROGRAMS += startup.rel
@@ -77,6 +75,9 @@ endif
noinst_LIBRARIES = libbsp.a noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES = 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 libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
if HAS_MP if HAS_MP
libbsp_a_LIBADD += shmsupp.rel libbsp_a_LIBADD += shmsupp.rel
@@ -121,13 +122,13 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
if HAS_CXX if HAS_CXX
$(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) $(PROJECT_LIB)/no-ctor.$(OBJEXT): no-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT) $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT)
TMPINSTALL_FILES += $(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)
endif endif
CLEANFILES = $(PREINSTALL_FILES) CLEANFILES = $(PREINSTALL_FILES)