Changeset 1d7f37b3 in rtems


Ignore:
Timestamp:
Jan 22, 2005, 10:26:57 AM (15 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 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:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/unix/posix/ChangeLog

    rf68b890 r1d7f37b3  
     12005-01-22      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * Makefile.am: Merge rtems-ctor.o into libbsp.a.
     4        Fix building rtems-ctor.o and no-ctor.o.
     5
    162005-01-07      Ralf Corsepius <ralf.corsepius@rtems.org>
    27
  • c/src/lib/libbsp/unix/posix/Makefile.am

    rf68b890 r1d7f37b3  
    2929
    3030if HAS_CXX
    31 # FIXME: libno-ctor ??
     31EXTRA_LIBRARIES = librtemscxx.a
     32
     33librtemscxx_a_SOURCES = startup/no-ctor.c
     34
     35# Install as a separate .$(OBJEXT)
     36project_lib_DATA += no-ctor.$(OBJEXT)
    3237
    3338# We install the RTEMS constructor as a separate .$(OBJEXT)
    3439# so it can be easily place correctly by the compiler config file.
    35 rtems-ctor.$(OBJEXT): startup/rtems-ctor.cc
    36         ${CXXCOMPILE} -o $@ -c $<
    3740project_lib_DATA += rtems-ctor.$(OBJEXT)
    38 
    39 no-ctor.$(OBJEXT): startup/no-ctor.cc
    40         ${CXXCOMPILE} -o $@ -c $<
    41 
    42 project_lib_DATA += no-ctor.$(OBJEXT)
    4341endif
    4442
     
    7876noinst_LIBRARIES = libbsp.a
    7977libbsp_a_SOURCES =
     78if HAS_CXX
     79libbsp_a_SOURCES += startup/rtems-ctor.cc
     80endif
    8081libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
    8182if HAS_MP
     
    122123
    123124if HAS_CXX
     125$(PROJECT_LIB)/no-ctor.$(OBJEXT): no-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     126        $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT)
     127TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor.$(OBJEXT)
     128
    124129$(PROJECT_LIB)/rtems-ctor.$(OBJEXT): rtems-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    125130        $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems-ctor.$(OBJEXT)
    126131TMPINSTALL_FILES += $(PROJECT_LIB)/rtems-ctor.$(OBJEXT)
    127 
    128 $(PROJECT_LIB)/no-ctor.$(OBJEXT): no-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
    129         $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT)
    130 TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor.$(OBJEXT)
    131132endif
    132133
Note: See TracChangeset for help on using the changeset viewer.