summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-07-22 09:56:13 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-07-22 09:56:13 +0000
commit405c7d129af7e4b091666be18a5afa7dd432be46 (patch)
tree4c16bf1ccb5c975a5091a815e37815fac920880c
parent17e97568caa1b530a9ec8fc1d09c7ca6b6404f79 (diff)
downloadrtems-405c7d129af7e4b091666be18a5afa7dd432be46.tar.bz2
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Use project_libdir instead of $(PROJECT_RELEASE)/lib. Eliminate LIBNAME. Pickup *.o's instead of *.rels for CPU_OBJS. Manually create $(project_libdir)$(MULTISUBDIR).
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/wrapup/Makefile.am11
2 files changed, 11 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index ff6a3e3042..41f9d365ac 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,11 @@
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * wrapup/Makefile.am: Use project_libdir instead of
+ $(PROJECT_RELEASE)/lib. Eliminate LIBNAME. Pickup *.o's instead of
+ *.rels for CPU_OBJS. Manually create $(project_libdir)$(MULTISUBDIR).
+
+2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* automake/lib.am: Use project_libdir instead of
$(PROJECT_RELEASE)/lib.
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 1583d3133d..04667dc5ae 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -2,15 +2,13 @@
## $Id$
##
-
-LIBNAME = librtemscpu
-LIB = $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
+LIB = $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a
include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
-CPU_OBJS = $(wildcard ../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel)
+CPU_OBJS = $(wildcard ../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.o)
CORE_OBJS = $(wildcard ../score/src/$(ARCH)/*.o)
SAPI_OBJS = $(wildcard ../sapi/src/$(ARCH)/*.o)
RTEMS_OBJS = $(wildcard ../rtems/src/$(ARCH)/*.o)
@@ -70,13 +68,14 @@ $(LIB): ${OBJS}
;; \
esac; \
done
+ test -d $(project_libdir)$(MULTISUBDIR) || $(mkinstalldirs) $(project_libdir)$(MULTISUBDIR)
$(AR) rc $@ $(ARCH)/*
rm -f $(ARCH)/*.o
$(RANLIB) $@
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
+TMPINSTALL_FILES += $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a
-#$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+#$(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a: $(LIB)
# $(INSTALL_DATA) $< $@
cpulibdir = $(libdir)