summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-12 10:39:38 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-12 10:39:38 +0000
commit731656e9578afddc0d5ee5b092e7746d58240cce (patch)
tree8fca6548a4a43e125513b1399b644f4079d87bc7
parentab25c25848da549d13f94a3ec339606f8275ed7a (diff)
downloadrtems-731656e9578afddc0d5ee5b092e7746d58240cce.tar.bz2
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Reworked.
-rw-r--r--cpukit/ChangeLog4
-rw-r--r--cpukit/wrapup/Makefile.am20
2 files changed, 15 insertions, 9 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index bd87087c51..89b05ae30a 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,9 @@
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).
* automake/lib.am: Remove $(project_libdir)$(MULTISUBDIR).
* aclocal/env-rtemscpu.m4: Reflect new definition of project_lib.
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