Changeset 4735923 in rtems


Ignore:
Timestamp:
Dec 10, 2002, 1:44:08 AM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
1c36c3e4
Parents:
f3f3db7a
Message:

2002-12-09 Ralf Corsepius <corsepiu@…>

  • src/Makefile.am: Remove.
  • include/Makefile.am: Remove.
  • Makefile.am: Merge-in src/Makefile.am, include/Makefile.am.
  • configure.ac: Reflect changes above. Unconditionally check for CXX.
Location:
c/src/librtems++
Files:
2 deleted
3 edited

Legend:

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

    rf3f3db7a r4735923  
     12002-12-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * src/Makefile.am: Remove.
     4        * include/Makefile.am: Remove.
     5        * Makefile.am: Merge-in src/Makefile.am, include/Makefile.am.
     6        * configure.ac: Reflect changes above.
     7        Unconditionally check for CXX.
     8
    192002-10-21      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    210
  • c/src/librtems++/Makefile.am

    rf3f3db7a r4735923  
    55ACLOCAL_AMFLAGS = -I ../../../aclocal
    66
    7 SUBDIRS = include src
     7include $(top_srcdir)/../../../automake/compile.am
     8include $(top_srcdir)/../../../automake/lib.am
    89
    9 include $(top_srcdir)/../../../automake/subdirs.am
     10include_rtems__dir = $(includedir)/rtems++
     11
     12$(PROJECT_INCLUDE)/%.h: include/%.h
     13        $(INSTALL_DATA) $< $@
     14
     15$(PROJECT_INCLUDE)/rtems++:
     16        @$(mkinstalldirs) $@
     17
     18if HAS_CXX
     19include_rtems___HEADERS = include/rtems++/rtemsEvent.h \
     20    include/rtems++/rtemsInterrupt.h include/rtems++/rtemsMessageQueue.h include/rtems++/rtemsSemaphore.h \
     21    include/rtems++/rtemsStatusCode.h include/rtems++/rtemsTask.h include/rtems++/rtemsTaskMode.h \
     22    include/rtems++/rtemsTimer.h
     23
     24PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems++ \
     25    $(include_rtems___HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     26
     27endif
     28
     29LIB = ${ARCH}/librtems++.a
     30
     31CC_FILES = src/rtemsEvent.cc src/rtemsInterrupt.cc src/rtemsMessageQueue.cc \
     32    src/rtemsSemaphore.cc src/rtemsStatusCode.cc src/rtemsTask.cc src/rtemsTimer.cc
     33CC_O_FILES = $(CC_FILES:src/%.cc=${ARCH}/%.$(OBJEXT))
     34
     35SRCS = $(CC_FILES)
     36OBJS = $(CC_O_FILES)
     37
     38TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a
     39
     40bsplib_DATA = $(LIB)
     41
     42${ARCH}/%.o: src/%.cc
     43        test -d $(ARCH) || mkdir $(ARCH)
     44        ${CXXCOMPILE} -o $@ -c $<
     45
     46$(LIB): $(OBJS)
     47        $(make-library)
     48
     49$(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a: $(LIB)
     50        $(INSTALL_DATA) $< $@
     51
     52all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     53
    1054include $(top_srcdir)/../../../automake/local.am
  • c/src/librtems++/configure.ac

    rf3f3db7a r4735923  
    2323RTEMS_CHECK_CXX(RTEMS_BSP)
    2424## check for g++
    25 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    26   RTEMS_PROG_CXX_FOR_TARGET
    27 fi
     25RTEMS_PROG_CXX_FOR_TARGET
    2826RTEMS_CANONICALIZE_TOOLS
    2927
     
    3331
    3432# Explicitly list all Makefiles here
    35 AC_CONFIG_FILES([Makefile
    36 include/Makefile
    37 src/Makefile
    38 ])
     33AC_CONFIG_FILES([Makefile])
    3934AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.