Changeset 2dbcee8 in rtems


Ignore:
Timestamp:
01/15/04 03:31:26 (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
033f0686
Parents:
e9f535e
Message:

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

  • configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS
  • Makefile.am: Use automake-compilation rules.
Location:
c/src/librtems++
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/librtems++/ChangeLog

    re9f535e r2dbcee8  
     12004-01-15      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS
     4        * Makefile.am: Use automake-compilation rules.
     5
    162004-01-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    27
  • c/src/librtems++/Makefile.am

    re9f535e r2dbcee8  
    88include $(top_srcdir)/../automake/lib.am
    99
    10 ${ARCH}/%.o: src/%.cc $(ARCH)/$(dirstamp)
    11         ${CXXCOMPILE} -o $@ -c $<
     10EXTRA_LIBRARIES =
     11CLEANFILES =
    1212
    1313if HAS_CXX
     
    2020    include/rtems++/rtemsTimer.h
    2121
    22 CC_FILES = src/rtemsEvent.cc src/rtemsInterrupt.cc src/rtemsMessageQueue.cc \
    23     src/rtemsSemaphore.cc src/rtemsStatusCode.cc src/rtemsTask.cc \
    24     src/rtemsTimer.cc
    25 OBJS = $(CC_FILES:src/%.cc=${ARCH}/%.$(OBJEXT))
     22EXTRA_LIBRARIES += librtems++.a
     23CLEANFILES += librtems++.a
     24librtems___a_SOURCES = src/rtemsEvent.cc src/rtemsInterrupt.cc \
     25    src/rtemsMessageQueue.cc src/rtemsSemaphore.cc src/rtemsStatusCode.cc \
     26    src/rtemsTask.cc src/rtemsTimer.cc
     27librtems___a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
    2628
    27 $(ARCH)/librtems++$(LIB_VARIANT).a: $(OBJS)
    28         $(make-library)
     29EXTRA_LIBRARIES += librtems++_g.a
     30CLEANFILES += librtems++_g.a
     31librtems___g_a_SOURCES = $(librtems___a_SOURCES)
     32librtems___g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
    2933
    30 project_lib_DATA = $(ARCH)/librtems++$(LIB_VARIANT).a
     34project_lib_DATA = librtems++$(LIB_VARIANT).a
    3135endif
    3236
     
    7983PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h
    8084
    81 $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a: $(ARCH)/librtems++$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
     85$(PROJECT_LIB)/librtems++$(LIB_VARIANT).a: librtems++$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
    8286        $(INSTALL_DATA) $< $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a
    8387TMPINSTALL_FILES += $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a
    8488endif
    8589
    86 CLEANFILES = $(PREINSTALL_FILES)
     90CLEANFILES += $(PREINSTALL_FILES)
    8791CLEANFILES += $(TMPINSTALL_FILES)
    8892
  • c/src/librtems++/configure.ac

    re9f535e r2dbcee8  
    1010RTEMS_CANONICAL_TARGET_CPU
    1111
    12 AM_INIT_AUTOMAKE([no-define foreign 1.8])
     12AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8])
    1313AM_MAINTAINER_MODE
    1414
Note: See TracChangeset for help on using the changeset viewer.