RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* 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.
This commit is contained in:
Ralf Corsepius
2002-12-10 01:44:08 +00:00
parent f3f3db7a5c
commit 4735923113
5 changed files with 56 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/librtems++/ChangeLog
View File

@@ -1,3 +1,11 @@
2002-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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 <corsepiu@faw.uni-ulm.de>
* .cvsignore: Reformat.

48
c/src/librtems++/Makefile.am
View File

@@ -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

9
c/src/librtems++/configure.ac
View File

@@ -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

27
c/src/librtems++/include/Makefile.am
View File

@@ -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

32
c/src/librtems++/src/Makefile.am
View File

@@ -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