Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-26 22:48:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS
	* Makefile.am: Use automake-compilation rules.
This commit is contained in:
Ralf Corsepius
2004-01-15 03:31:26 +00:00
parent e9f535e1ec
commit 2dbcee87f2
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,8 @@
2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS
* Makefile.am: Use automake-compilation rules.
2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES.

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

@@ -7,8 +7,8 @@ ACLOCAL_AMFLAGS = -I ../aclocal
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/lib.am
${ARCH}/%.o: src/%.cc $(ARCH)/$(dirstamp)
${CXXCOMPILE} -o $@ -c $<
EXTRA_LIBRARIES =
CLEANFILES =
if HAS_CXX
include_rtems__dir = $(includedir)/rtems++
@@ -19,15 +19,19 @@ include_rtems___HEADERS = include/rtems++/rtemsEvent.h \
include/rtems++/rtemsTask.h include/rtems++/rtemsTaskMode.h \
include/rtems++/rtemsTimer.h
CC_FILES = src/rtemsEvent.cc src/rtemsInterrupt.cc src/rtemsMessageQueue.cc \
src/rtemsSemaphore.cc src/rtemsStatusCode.cc src/rtemsTask.cc \
src/rtemsTimer.cc
OBJS = $(CC_FILES:src/%.cc=${ARCH}/%.$(OBJEXT))
EXTRA_LIBRARIES += librtems++.a
CLEANFILES += librtems++.a
librtems___a_SOURCES = src/rtemsEvent.cc src/rtemsInterrupt.cc \
src/rtemsMessageQueue.cc src/rtemsSemaphore.cc src/rtemsStatusCode.cc \
src/rtemsTask.cc src/rtemsTimer.cc
librtems___a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
$(ARCH)/librtems++$(LIB_VARIANT).a: $(OBJS)
$(make-library)
EXTRA_LIBRARIES += librtems++_g.a
CLEANFILES += librtems++_g.a
librtems___g_a_SOURCES = $(librtems___a_SOURCES)
librtems___g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
project_lib_DATA = $(ARCH)/librtems++$(LIB_VARIANT).a
project_lib_DATA = librtems++$(LIB_VARIANT).a
endif
all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
@@ -78,12 +82,12 @@ $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h: include/rtems++/rtemsTimer.h $(PROJECT_
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h
$(PROJECT_LIB)/librtems++$(LIB_VARIANT).a: $(ARCH)/librtems++$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
$(PROJECT_LIB)/librtems++$(LIB_VARIANT).a: librtems++$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a
TMPINSTALL_FILES += $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a
endif
CLEANFILES = $(PREINSTALL_FILES)
CLEANFILES += $(PREINSTALL_FILES)
CLEANFILES += $(TMPINSTALL_FILES)
include $(top_srcdir)/../automake/local.am

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

@@ -9,7 +9,7 @@ RTEMS_TOP(../../..)
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define foreign 1.8])
AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8])
AM_MAINTAINER_MODE
RTEMS_ENABLE_CXX