From 4735923113200518cce718609f49ebe5181b6d15 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 10 Dec 2002 01:44:08 +0000 Subject: 2002-12-09 Ralf Corsepius * 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. --- c/src/librtems++/ChangeLog | 8 ++++++ c/src/librtems++/Makefile.am | 48 ++++++++++++++++++++++++++++++++++-- c/src/librtems++/configure.ac | 9 ++----- c/src/librtems++/include/Makefile.am | 27 -------------------- c/src/librtems++/src/Makefile.am | 32 ------------------------ 5 files changed, 56 insertions(+), 68 deletions(-) delete mode 100644 c/src/librtems++/include/Makefile.am delete mode 100644 c/src/librtems++/src/Makefile.am (limited to 'c/src/librtems++') diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog index 9f5076137f..c177c485b7 100644 --- a/c/src/librtems++/ChangeLog +++ b/c/src/librtems++/ChangeLog @@ -1,3 +1,11 @@ +2002-12-09 Ralf Corsepius + + * 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. + 2002-10-21 Ralf Corsepius * .cvsignore: Reformat. diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am index 4fbb395f69..527e22c52f 100644 --- a/c/src/librtems++/Makefile.am +++ b/c/src/librtems++/Makefile.am @@ -4,7 +4,51 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal -SUBDIRS = include src +include $(top_srcdir)/../../../automake/compile.am +include $(top_srcdir)/../../../automake/lib.am + +include_rtems__dir = $(includedir)/rtems++ + +$(PROJECT_INCLUDE)/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE)/rtems++: + @$(mkinstalldirs) $@ + +if HAS_CXX +include_rtems___HEADERS = include/rtems++/rtemsEvent.h \ + include/rtems++/rtemsInterrupt.h include/rtems++/rtemsMessageQueue.h include/rtems++/rtemsSemaphore.h \ + include/rtems++/rtemsStatusCode.h include/rtems++/rtemsTask.h include/rtems++/rtemsTaskMode.h \ + include/rtems++/rtemsTimer.h + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems++ \ + $(include_rtems___HEADERS:include/%=$(PROJECT_INCLUDE)/%) + +endif + +LIB = ${ARCH}/librtems++.a + +CC_FILES = src/rtemsEvent.cc src/rtemsInterrupt.cc src/rtemsMessageQueue.cc \ + src/rtemsSemaphore.cc src/rtemsStatusCode.cc src/rtemsTask.cc src/rtemsTimer.cc +CC_O_FILES = $(CC_FILES:src/%.cc=${ARCH}/%.$(OBJEXT)) + +SRCS = $(CC_FILES) +OBJS = $(CC_O_FILES) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a + +bsplib_DATA = $(LIB) + +${ARCH}/%.o: src/%.cc + test -d $(ARCH) || mkdir $(ARCH) + ${CXXCOMPILE} -o $@ -c $< + +$(LIB): $(OBJS) + $(make-library) + +$(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a: $(LIB) + $(INSTALL_DATA) $< $@ + +all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/librtems++/configure.ac b/c/src/librtems++/configure.ac index 99d4c5a890..73c58bb1ea 100644 --- a/c/src/librtems++/configure.ac +++ b/c/src/librtems++/configure.ac @@ -22,9 +22,7 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_CXX(RTEMS_BSP) ## check for g++ -if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then - RTEMS_PROG_CXX_FOR_TARGET -fi +RTEMS_PROG_CXX_FOR_TARGET RTEMS_CANONICALIZE_TOOLS AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes") @@ -32,8 +30,5 @@ AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes") RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -include/Makefile -src/Makefile -]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/librtems++/include/Makefile.am b/c/src/librtems++/include/Makefile.am deleted file mode 100644 index efa4ab826c..0000000000 --- a/c/src/librtems++/include/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## -## $Id$ -## - - -include_rtems__dir = $(includedir)/rtems++ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/rtems++: - @$(mkinstalldirs) $@ - -if HAS_CXX -include_rtems___HEADERS = rtems++/rtemsEvent.h \ - rtems++/rtemsInterrupt.h rtems++/rtemsMessageQueue.h rtems++/rtemsSemaphore.h \ - rtems++/rtemsStatusCode.h rtems++/rtemsTask.h rtems++/rtemsTaskMode.h \ - rtems++/rtemsTimer.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems++ \ - $(include_rtems___HEADERS:%=$(PROJECT_INCLUDE)/%) - -endif - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/librtems++/src/Makefile.am b/c/src/librtems++/src/Makefile.am deleted file mode 100644 index 137b8fa53a..0000000000 --- a/c/src/librtems++/src/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -LIB = ${ARCH}/librtems++.a - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am - -CC_FILES = rtemsEvent.cc rtemsInterrupt.cc rtemsMessageQueue.cc \ - rtemsSemaphore.cc rtemsStatusCode.cc rtemsTask.cc rtemsTimer.cc -CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.$(OBJEXT)) - -SRCS = $(CC_FILES) -OBJS = $(CC_O_FILES) - -AM_CFLAGS += $(LIBC_DEFINES) - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a - -bsplib_DATA = $(LIB) - -$(LIB): $(OBJS) - $(make-library) - -$(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ - -all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3