From 2dbcee87f2f1656731abadbbba426c482da22e69 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 15 Jan 2004 03:31:26 +0000
Subject: 2004-01-15	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: Add subdir-objects to AUTOMAKE_OPTIONS
	* Makefile.am: Use automake-compilation rules.
---
 c/src/librtems++/ChangeLog    |  5 +++++
 c/src/librtems++/Makefile.am  | 26 +++++++++++++++-----------
 c/src/librtems++/configure.ac |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'c')

diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog
index 819a560cdf..76d35cbd38 100644
--- a/c/src/librtems++/ChangeLog
+++ b/c/src/librtems++/ChangeLog
@@ -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.
diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am
index 2d2275437d..6b128371fa 100644
--- a/c/src/librtems++/Makefile.am
+++ b/c/src/librtems++/Makefile.am
@@ -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
diff --git a/c/src/librtems++/configure.ac b/c/src/librtems++/configure.ac
index 0772418f43..9480bd4f3a 100644
--- a/c/src/librtems++/configure.ac
+++ b/c/src/librtems++/configure.ac
@@ -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
-- 
cgit v1.2.3