Changeset 0e31ed7 in rtems


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    rc0ed3a2 r0e31ed7  
     12003-12-11      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * aclocal/env-rtemsbsp.m4: AC_SUBST(project_libdir).
     4        * automake/lib.am: Remove project_libdir.
     5        * wrapup/Makefile.am: Reworked.
     6
    172003-12-09      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    28
  • c/src/aclocal/env-rtemsbsp.m4

    rc0ed3a2 r0e31ed7  
    5252libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
    5353
    54 bsplibdir="\${exec_prefix}/${RTEMS_BSP}/lib"
    55 AC_SUBST(bsplibdir)
     54AC_SUBST([bsplibdir],["\${exec_prefix}/${RTEMS_BSP}/lib"])
     55AC_SUBST([project_libdir],["\$(libdir)"])
    5656])
  • c/src/automake/lib.am

    rc0ed3a2 r0e31ed7  
    1616endef
    1717
    18 project_libdir = $(libdir)
    19 
    2018$(PROJECT_RELEASE)/lib/$(dirstamp):
    2119        @$(mkinstalldirs) $@
  • c/src/wrapup/Makefile.am

    rc0ed3a2 r0e31ed7  
    88include $(top_srcdir)/automake/lib.am
    99
    10 LIB = $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
     10project_lib_DATA = $(ARCH)/librtemsbsp$(LIB_VARIANT).a
    1111
    1212SRCS = ../support/${ARCH}/libsupport.a
    1313
    1414if HAS_LIBBSP
    15 SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a
     15SRCS += \
     16    ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a
    1617endif
    1718
     
    2122
    2223if HAS_RDBG
    23 SRCS += $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a
     24SRCS += ../librdbg/src/$(RTEMS_CPU)/$(ARCH)/librdbg.a
    2425endif
    2526
     
    3031SRCS += ../libchip/serial/$(ARCH)/libserialio.a
    3132SRCS += ../libchip/ide/$(ARCH)/libide.a
    32 SRCS += $(wildcard $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a)
     33if HAS_NETWORKING
     34SRCS += ../libchip/network/$(ARCH)/libnetchip$(LIB_VARIANT).a
     35endif
    3336endif
    3437
    35 SRCS += $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
     38SRCS += $(wildcard \
     39    $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
    3640
    37 TMPINSTALL_FILES += $(LIB)
     41all-local: $(TMPINSTALL_FILES)
    3842
    39 all-local: $(LIB) $(TMPINSTALL_FILES)
    40 
    41 $(LIB): $(SRCS)
    42         rm -f $@
    43         rm -rf $(ARCH)/*
    44         test -d $(ARCH) || mkdir $(ARCH)
     43$(ARCH)/librtemsbsp$(LIB_VARIANT).a: $(SRCS) $(ARCH)/$(dirstamp)
     44        rm -rf $(ARCH)/*.a $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
    4545        for f in $(SRCS); do \
    4646          case $$f in \
     
    6767        done
    6868        $(AR) rc $@ $(ARCH)/*
    69         rm -f $(ARCH)/*
    7069        $(RANLIB) $@
    7170
    72 install-data-local:
    73         @$(mkinstalldirs) $(DESTDIR)$(bsplibdir)
    74         $(INSTALL_DATA) $(LIB) $(DESTDIR)$(bsplibdir)
     71${PROJECT_RELEASE}/lib/librtemsbsp$(LIB_VARIANT).a: $(ARCH)/librtemsbsp$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp)
     72        $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/librtemsbsp$(LIB_VARIANT).a
     73TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/librtemsbsp$(LIB_VARIANT).a
    7574
    7675include $(top_srcdir)/automake/local.am
Note: See TracChangeset for help on using the changeset viewer.