diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-11 12:43:55 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-11 12:43:55 +0000 |
| commit | 0e31ed7a674db2c3b806432ac3dcc149facca457 (patch) | |
| tree | a51db1e33be5b9d803b8b3c5c6532ce3ab857aba /c | |
| parent | 2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-0e31ed7a674db2c3b806432ac3dcc149facca457.tar.bz2 | |
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.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/aclocal/env-rtemsbsp.m4 | 4 | ||||
| -rw-r--r-- | c/src/automake/lib.am | 2 | ||||
| -rw-r--r-- | c/src/wrapup/Makefile.am | 31 |
4 files changed, 23 insertions, 20 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 32aad7cd54..865f9ec358 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +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> * configure.ac: Reflect changes to librdbg. diff --git a/c/src/aclocal/env-rtemsbsp.m4 b/c/src/aclocal/env-rtemsbsp.m4 index 6f188f813d..1dc9f78b1e 100644 --- a/c/src/aclocal/env-rtemsbsp.m4 +++ b/c/src/aclocal/env-rtemsbsp.m4 @@ -51,6 +51,6 @@ AM_CONDITIONAL([MULTILIB],[false]) includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" 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)"]) ]) diff --git a/c/src/automake/lib.am b/c/src/automake/lib.am index 6cea6ddc9d..9a5aa21c71 100644 --- a/c/src/automake/lib.am +++ b/c/src/automake/lib.am @@ -15,8 +15,6 @@ $(AR) $(ARFLAGS) $@ $^ $(RANLIB) $@ endef -project_libdir = $(libdir) - $(PROJECT_RELEASE)/lib/$(dirstamp): @$(mkinstalldirs) $@ @: > $(PROJECT_RELEASE)/lib/$(dirstamp) diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index bd83bc25fb..1b04218625 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -7,12 +7,13 @@ include $(top_srcdir)/automake/compile.am 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 if HAS_NETWORKING @@ -20,7 +21,7 @@ SRCS += ../libnetworking/wrapup/$(ARCH)/libnetapps.a endif if HAS_RDBG -SRCS += $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a +SRCS += ../librdbg/src/$(RTEMS_CPU)/$(ARCH)/librdbg.a endif SRCS += $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) @@ -29,19 +30,18 @@ if LIBCHIP SRCS += ../libchip/rtc/$(ARCH)/librtcio.a 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)) - -TMPINSTALL_FILES += $(LIB) +SRCS += $(wildcard \ + $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)) -all-local: $(LIB) $(TMPINSTALL_FILES) +all-local: $(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 \ *.$(OBJEXT) | *.rel) \ @@ -66,11 +66,10 @@ $(LIB): $(SRCS) esac; \ 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 |