From 5ef82f9716844ce4b24a9d6fd5280ea14e2e17f7 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 1 Dec 2003 04:10:53 +0000
Subject: 2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* automake/compile.am: Add $(ARCH)/$(dirstamp) rules.
	* wrapup/Makefile.am: Reflect $(dirstamp) changes.
---
 cpukit/ChangeLog           | 5 +++++
 cpukit/automake/compile.am | 9 +++++----
 cpukit/wrapup/Makefile.am  | 8 +++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index b3b1195867..b790d59677 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* automake/compile.am: Add $(ARCH)/$(dirstamp) rules.
+	* wrapup/Makefile.am: Reflect $(dirstamp) changes.
+
 2003-11-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Add $(dirstamp) to preinstallation rules.
diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am
index eb5b1435ef..6f4627f68c 100644
--- a/cpukit/automake/compile.am
+++ b/cpukit/automake/compile.am
@@ -56,10 +56,10 @@ CCLD = $(CC)
 
 CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
 
-${ARCH}/%.$(OBJEXT): %.c
+${ARCH}/%.$(OBJEXT): %.c $(ARCH)/$(dirstamp)
 	${COMPILE} -o $@ -c $<
 
-${ARCH}/%.$(OBJEXT): %.S
+${ARCH}/%.$(OBJEXT): %.S $(ARCH)/$(dirstamp)
 	${CCASCOMPILE} -o $@ -c $<
 
 # Make foo.rel from foo.$(OBJEXT)
@@ -116,8 +116,9 @@ ARCH_DEBUG_V = o-debug
 ARCH__V = $(ARCH_OPTIMIZE_V)
 ARCH = $(ARCH_$(VARIANT_V)_V)
 
-${ARCH}:
-	mkdir ${ARCH}
+${ARCH}/$(dirstamp):
+	@$(mkinstalldirs) $(ARCH)
+	@: > $(ARCH)/$(dirstamp)
 
 ## Setup the library suffix
 LIBSUFFIX_OPTIMIZE_V =
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index d37b5c2687..7869898c31 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -66,9 +66,11 @@ LIBS += ../librpc/src/rpc/$(ARCH)/librpc.a
 LIBS += ../librpc/src/xdr/$(ARCH)/libxdr.a
 endif
 
+$(LIBS): $(ARCH)/$(dirstamp)
+
 $(LIB): ${LIBS}
 	rm -f $@
-	rm -rf $(ARCH)/*
+	rm -rf $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
 	for f in $(LIBS); do \
 	  case $$f in \
 	  *.$(OBJEXT) | *.rel) \
@@ -94,12 +96,12 @@ $(LIB): ${LIBS}
 	done
 	test -d $(project_libdir) || $(mkinstalldirs) $(project_libdir)
 	$(AR) rc $@ $(ARCH)/*
-	rm -f $(ARCH)/*.$(OBJEXT)
+	rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
 	$(RANLIB) $@
 
 TMPINSTALL_FILES += $(project_libdir)/librtemscpu$(LIB_VARIANT).a
 
-all-am: $(ARCH) $(LIB) $(TMPINSTALL_FILES)
+all-am: $(LIB) $(TMPINSTALL_FILES)
 
 install-data-hook: $(LIB)
 	@$(mkinstalldirs) $(DESTDIR)$(libdir)
-- 
cgit v1.2.3