From 731656e9578afddc0d5ee5b092e7746d58240cce Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 12 Dec 2003 10:39:38 +0000
Subject: 2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* wrapup/Makefile.am: Reworked.
---
 cpukit/ChangeLog          |  4 ++++
 cpukit/wrapup/Makefile.am | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index bd87087c51..89b05ae30a 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* wrapup/Makefile.am: Reworked.
+
 2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* aclocal/lead-dot.m4: Remove (Use the version in automake-1.8).
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 7869898c31..367df6673a 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -2,12 +2,12 @@
 ## $Id$
 ##
 
-LIB = $(project_libdir)/librtemscpu$(LIB_VARIANT).a
-
 include $(top_srcdir)/automake/multilib.am
 include $(top_srcdir)/automake/compile.am
 include $(top_srcdir)/automake/lib.am
 
+project_lib_DATA = $(ARCH)/librtemscpu$(LIB_VARIANT).a
+
 LIBS =
 if LIBSCORECPU
 LIBS += ../score/cpu/$(RTEMS_CPU)/$(ARCH)/libscorecpu.a
@@ -68,7 +68,7 @@ endif
 
 $(LIBS): $(ARCH)/$(dirstamp)
 
-$(LIB): ${LIBS}
+$(ARCH)/librtemscpu$(LIB_VARIANT).a: ${LIBS}
 	rm -f $@
 	rm -rf $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
 	for f in $(LIBS); do \
@@ -94,17 +94,19 @@ $(LIB): ${LIBS}
 	    ;; \
 	  esac; \
 	done
-	test -d $(project_libdir) || $(mkinstalldirs) $(project_libdir)
 	$(AR) rc $@ $(ARCH)/*
 	rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
 	$(RANLIB) $@
 
-TMPINSTALL_FILES += $(project_libdir)/librtemscpu$(LIB_VARIANT).a
+all-local: $(TMPINSTALL_FILES)
 
-all-am: $(LIB) $(TMPINSTALL_FILES)
+${PROJECT_RELEASE}/lib/$(dirstamp):
+	@$(mkinstalldirs) ${PROJECT_RELEASE}/lib
+	@: > ${PROJECT_RELEASE}/lib/$(dirstamp)
+TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/$(dirstamp)
 
-install-data-hook: $(LIB)
-	@$(mkinstalldirs) $(DESTDIR)$(libdir)
-	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)
+${PROJECT_RELEASE}/lib/librtemscpu$(LIB_VARIANT).a: $(ARCH)/librtemscpu$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp)
+	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/librtemscpu$(LIB_VARIANT).a
+TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/librtemscpu$(LIB_VARIANT).a
 
 include $(top_srcdir)/automake/local.am
-- 
cgit v1.2.3