2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Add dirstamp support.

2 files changed, 61 insertions, 30 deletions

diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog
index 5dd83aa562..6a76504ad1 100644
--- a/c/src/librtems++/ChangeLog
+++ b/c/src/librtems++/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add dirstamp support.
+
 2003-12-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Remove all-local: $(ARCH).
diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am
index ac7800d8f1..cbdd417928 100644
--- a/c/src/librtems++/Makefile.am
+++ b/c/src/librtems++/Makefile.am
@@ -7,47 +7,74 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 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) $@
+${ARCH}/%.o: src/%.cc $(ARCH)/$(dirstamp)
+	${CXXCOMPILE} -o $@ -c $<
 
 if HAS_CXX
+include_rtems__dir = $(includedir)/rtems++
+
 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++/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++$(LIB_VARIANT).a
-
 CC_FILES = src/rtemsEvent.cc src/rtemsInterrupt.cc src/rtemsMessageQueue.cc \
-    src/rtemsSemaphore.cc src/rtemsStatusCode.cc src/rtemsTask.cc src/rtemsTimer.cc
+    src/rtemsSemaphore.cc src/rtemsStatusCode.cc src/rtemsTask.cc \
+    src/rtemsTimer.cc
 OBJS = $(CC_FILES:src/%.cc=${ARCH}/%.$(OBJEXT))
 
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a
-
-install-data-local: $(LIB)
-	@$(mkinstalldirs) $(DESTDIR)$(bsplibdir)
-	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(bsplibdir)
-
-${ARCH}/%.o: src/%.cc
-	test -d $(ARCH) || mkdir $(ARCH)
-	${CXXCOMPILE} -o $@ -c $<
-
-$(LIB): $(OBJS)
+$(ARCH)/librtems++$(LIB_VARIANT).a: $(OBJS)
 	$(make-library)
 
-$(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a: $(LIB)
-	$(INSTALL_DATA) $< $@
+project_lib_DATA = $(ARCH)/librtems++$(LIB_VARIANT).a
+endif
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
+PREINSTALL_FILES =
+
+if HAS_CXX
+$(PROJECT_INCLUDE)/rtems++/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems++
+	@: > $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems++/rtemsEvent.h: include/rtems++/rtemsEvent.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsEvent.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsEvent.h
+
+$(PROJECT_INCLUDE)/rtems++/rtemsInterrupt.h: include/rtems++/rtemsInterrupt.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsInterrupt.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsInterrupt.h
+
+$(PROJECT_INCLUDE)/rtems++/rtemsMessageQueue.h: include/rtems++/rtemsMessageQueue.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsMessageQueue.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsMessageQueue.h
+
+$(PROJECT_INCLUDE)/rtems++/rtemsSemaphore.h: include/rtems++/rtemsSemaphore.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsSemaphore.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsSemaphore.h
+
+$(PROJECT_INCLUDE)/rtems++/rtemsStatusCode.h: include/rtems++/rtemsStatusCode.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsStatusCode.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsStatusCode.h
+
+$(PROJECT_INCLUDE)/rtems++/rtemsTask.h: include/rtems++/rtemsTask.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsTask.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsTask.h
+
+$(PROJECT_INCLUDE)/rtems++/rtemsTaskMode.h: include/rtems++/rtemsTaskMode.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsTaskMode.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsTaskMode.h
+
+$(PROJECT_INCLUDE)/rtems++/rtemsTimer.h: include/rtems++/rtemsTimer.h $(PROJECT_INCLUDE)/rtems++/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h
+
+${PROJECT_RELEASE}/lib/librtems++$(LIB_VARIANT).a: $(ARCH)/librtems++$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp)
+	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/librtems++$(LIB_VARIANT).a
+TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/librtems++$(LIB_VARIANT).a
+endif
+
 include $(top_srcdir)/../automake/local.am