Changeset dd551dbf in rtems


Ignore:
Timestamp:
Jan 30, 2004, 10:06:56 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
eb3456d
Parents:
c6cf3ba
Message:

2004-01-30 Ralf Corsepius <corsepiu@…>

  • Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am. Use automake compilation rules.
  • clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove.
  • configure.ac: Reflect changes above.
Location:
c/src/lib/libbsp/unix/posix
Files:
12 deleted
3 edited

Legend:

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

    rc6cf3ba rdd551dbf  
     12004-01-30      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
     4        shmsupp/Makefile.am, startup/Makefile.am, timer/Makefile.am,
     5        wrapup/Makefile.am. Use automake compilation rules.
     6        * clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am,
     7        startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Remove.
     8        * configure.ac: Reflect changes above.
     9
    1102004-01-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    211
  • c/src/lib/libbsp/unix/posix/Makefile.am

    rc6cf3ba rdd551dbf  
    77# wrapup is the one that actually builds and installs the library
    88# from the individual .rel files built in other directories
    9 SUBDIRS = . startup clock console timer shmsupp wrapup tools
     9SUBDIRS = . tools
    1010
     11include $(top_srcdir)/../../../../automake/compile.am
    1112include $(top_srcdir)/../../bsp.am
    1213
    13 nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
     14EXTRA_PROGRAMS =
     15CLEANFILES =
     16noinst_DATA =
    1417
    15 all-local: $(PREINSTALL_FILES)
     18nodist_include_HEADERS += ../../shared/include/coverhd.h
     19
     20AM_CFLAGS += $(LIBC_DEFINES)
     21
     22project_lib_DATA =
     23
     24if HAS_CXX
     25# FIXME: libno-ctor ??
     26
     27# We install the RTEMS constructor as a separate .$(OBJEXT)
     28# so it can be easily place correctly by the compiler config file.
     29rtems-ctor$(LIB_VARIANT).$(OBJEXT): startup/rtems-ctor.cc
     30        ${CXXCOMPILE} -o $@ -c $<
     31project_lib_DATA += rtems-ctor$(LIB_VARIANT).$(OBJEXT)
     32
     33no-ctor$(LIB_VARIANT).$(OBJEXT): startup/no-ctor.cc
     34        ${CXXCOMPILE} -o $@ -c $<
     35
     36project_lib_DATA += no-ctor$(LIB_VARIANT).$(OBJEXT)
     37endif
     38
     39EXTRA_PROGRAMS += startup.rel
     40CLEANFILES += startup.rel
     41startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     42    startup/bspstart.c startup/setvec.c
     43if HAS_CXX
     44startup_rel_SOURCES += startup/main.c
     45endif
     46
     47startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     48startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     49
     50EXTRA_PROGRAMS += startup_g.rel
     51CLEANFILES += startup_g.rel
     52startup_g_rel_SOURCES = $(startup_rel_SOURCES)
     53startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     54startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     55
     56noinst_DATA += startup$(LIB_VARIANT).rel
     57
     58EXTRA_PROGRAMS += clock.rel
     59CLEANFILES += clock.rel
     60clock_rel_SOURCES = clock/clock.c
     61clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     62clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     63
     64EXTRA_PROGRAMS += clock_g.rel
     65CLEANFILES += clock_g.rel
     66clock_g_rel_SOURCES = $(clock_rel_SOURCES)
     67clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     68clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     69
     70noinst_DATA += clock$(LIB_VARIANT).rel
     71
     72EXTRA_PROGRAMS += console.rel
     73CLEANFILES += console.rel
     74console_rel_SOURCES = console/console.c
     75console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     76console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     77
     78EXTRA_PROGRAMS += console_g.rel
     79CLEANFILES += console_g.rel
     80console_g_rel_SOURCES = $(console_rel_SOURCES)
     81console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     82console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     83
     84noinst_DATA += console$(LIB_VARIANT).rel
     85
     86EXTRA_PROGRAMS += timer.rel
     87CLEANFILES += timer.rel
     88timer_rel_SOURCES = timer/timer.c
     89timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     90timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     91
     92EXTRA_PROGRAMS += timer_g.rel
     93CLEANFILES += timer_g.rel
     94timer_g_rel_SOURCES = $(timer_rel_SOURCES)
     95timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     96timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     97
     98noinst_DATA += timer$(LIB_VARIANT).rel
     99
     100if HAS_MP
     101EXTRA_PROGRAMS += shmsupp.rel
     102CLEANFILES += shmsupp.rel
     103shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c \
     104    shmsupp/cause_intr.c shmsupp/lock.c shmsupp/mpisr.c
     105shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
     106shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     107
     108EXTRA_PROGRAMS += shmsupp_g.rel
     109CLEANFILES += shmsupp_g.rel
     110shmsupp_g_rel_SOURCES = $(shmsupp_rel_SOURCES)
     111shmsupp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
     112shmsupp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     113
     114noinst_DATA += shmsupp$(LIB_VARIANT).rel
     115endif
     116
     117EXTRA_LIBRARIES = libbsp.a
     118CLEANFILES += libbsp.a
     119libbsp_a_SOURCES =
     120libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \
     121    console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel
     122if HAS_MP
     123libbsp_a_LIBADD += shmsupp$(LIB_VARIANT).rel
     124endif
     125EXTRA_LIBRARIES += libbsp_g.a
     126CLEANFILES += libbsp_g.a
     127libbsp_g_a_SOURCES = $(libbsp_a_SOURCES)
     128libbsp_g_a_LIBADD = $(libbsp_a_LIBADD)
     129
     130noinst_DATA += libbsp$(LIB_VARIANT).a
     131
     132all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
    16133
    17134EXTRA_DIST = times
    18135
    19136PREINSTALL_DIRS =
     137TMPINSTALL_FILES =
    20138
    21 $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
     139$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
    22140        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
    23141PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
    24142
    25 CLEANFILES = $(PREINSTALL_FILES)
     143if HAS_CXX
     144$(PROJECT_LIB)/rtems-ctor$(LIB_VARIANT).$(OBJEXT): rtems-ctor$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     145        $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems-ctor$(LIB_VARIANT).$(OBJEXT)
     146TMPINSTALL_FILES += $(PROJECT_LIB)/rtems-ctor$(LIB_VARIANT).$(OBJEXT)
     147
     148$(PROJECT_LIB)/no-ctor$(LIB_VARIANT).$(OBJEXT): no-ctor$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
     149        $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor$(LIB_VARIANT).$(OBJEXT)
     150TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor$(LIB_VARIANT).$(OBJEXT)
     151endif
     152
     153CLEANFILES += $(PREINSTALL_FILES)
    26154DISTCLEANFILES = $(PREINSTALL_DIRS)
     155CLEANFILES += $(TMPINSTALL_FILES)
    27156
    28 include $(top_srcdir)/../../../../automake/subdirs.am
    29157include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/unix/posix/configure.ac

    rc6cf3ba rdd551dbf  
    3939
    4040# Explicitly list all Makefiles here
    41 AC_CONFIG_FILES([Makefile
    42 clock/Makefile
    43 console/Makefile
    44 shmsupp/Makefile
    45 startup/Makefile
    46 timer/Makefile
    47 wrapup/Makefile])
     41AC_CONFIG_FILES([Makefile])
    4842AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.