Changeset 0e31ed7 in rtems

Timestamp:

Dec 11, 2003, 12:43:55 PM (16 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

5cb24705

Parents:

c0ed3a2

Message:

2003-12-11 Ralf Corsepius <corsepiu@…>

• aclocal/env-rtemsbsp.m4: AC_SUBST(project_libdir).
• automake/lib.am: Remove project_libdir.
• wrapup/Makefile.am: Reworked.

Location:

c/src

Files:

• ChangeLog (modified) (1 diff)
• aclocal/env-rtemsbsp.m4 (modified) (1 diff)
• automake/lib.am (modified) (1 diff)
• wrapup/Makefile.am (modified) (4 diffs)

c/src/ChangeLog

@@ +1 @@
+2003-12-11      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * aclocal/env-rtemsbsp.m4: AC_SUBST(project_libdir).
+        * automake/lib.am: Remove project_libdir.
+        * wrapup/Makefile.am: Reworked.
+
 2003-12-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

c/src/aclocal/env-rtemsbsp.m4

@@ -52 +52 @@
 libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
 
-bsplibdir="\${exec_prefix}/${RTEMS_BSP}/lib"
-AC_SUBST(bsplibdir)
+AC_SUBST([bsplibdir],["\${exec_prefix}/${RTEMS_BSP}/lib"])
+AC_SUBST([project_libdir],["\$(libdir)"])
 ])

c/src/automake/lib.am

@@ -16 +16 @@
 endef
 
-project_libdir = $(libdir)
-
 $(PROJECT_RELEASE)/lib/$(dirstamp):
         @$(mkinstalldirs) $@

c/src/wrapup/Makefile.am

@@ -8 +8 @@
 include $(top_srcdir)/automake/lib.am
 
-LIB = $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
+project_lib_DATA = $(ARCH)/librtemsbsp$(LIB_VARIANT).a
 
 SRCS = ../support/${ARCH}/libsupport.a
 
 if HAS_LIBBSP
-SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a
+SRCS += \
+    ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a
 endif
 
@@ -21 +22 @@
 
 if HAS_RDBG
-SRCS += $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a
+SRCS += ../librdbg/src/$(RTEMS_CPU)/$(ARCH)/librdbg.a
 endif
 
@@ -30 +31 @@
 SRCS += ../libchip/serial/$(ARCH)/libserialio.a
 SRCS += ../libchip/ide/$(ARCH)/libide.a
-SRCS += $(wildcard $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a)
+if HAS_NETWORKING
+SRCS += ../libchip/network/$(ARCH)/libnetchip$(LIB_VARIANT).a
+endif
 endif
 
-SRCS += $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
+SRCS += $(wildcard \
+    $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
 
-TMPINSTALL_FILES += $(LIB)
+all-local: $(TMPINSTALL_FILES)
 
-all-local: $(LIB) $(TMPINSTALL_FILES)
-
-$(LIB): $(SRCS)
-        rm -f $@
-        rm -rf $(ARCH)/*
-        test -d $(ARCH) || mkdir $(ARCH)
+$(ARCH)/librtemsbsp$(LIB_VARIANT).a: $(SRCS) $(ARCH)/$(dirstamp)
+        rm -rf $(ARCH)/*.a $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
         for f in $(SRCS); do \
           case $$f in \
@@ -67 +67 @@
         done
         $(AR) rc $@ $(ARCH)/*
-        rm -f $(ARCH)/*
         $(RANLIB) $@
 
-install-data-local:
-        @$(mkinstalldirs) $(DESTDIR)$(bsplibdir)
-        $(INSTALL_DATA) $(LIB) $(DESTDIR)$(bsplibdir)
+${PROJECT_RELEASE}/lib/librtemsbsp$(LIB_VARIANT).a: $(ARCH)/librtemsbsp$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp)
+        $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/librtemsbsp$(LIB_VARIANT).a
+TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/librtemsbsp$(LIB_VARIANT).a
 
 include $(top_srcdir)/automake/local.am