RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* aclocal/env-rtemsbsp.m4: AC_SUBST(project_libdir).
	* automake/lib.am: Remove project_libdir.
	* wrapup/Makefile.am: Reworked.
This commit is contained in:
Ralf Corsepius
2003-12-11 12:43:55 +00:00
parent c0ed3a2fa6
commit 0e31ed7a67
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/ChangeLog
View File

@@ -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.

4
c/src/aclocal/env-rtemsbsp.m4
View File

@@ -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)"])
])

2
c/src/automake/lib.am
View File

@@ -15,8 +15,6 @@ $(AR) $(ARFLAGS) $@ $^
$(RANLIB) $@
endef
project_libdir = $(libdir)
$(PROJECT_RELEASE)/lib/$(dirstamp):
@$(mkinstalldirs) $@
@: > $(PROJECT_RELEASE)/lib/$(dirstamp)

31
c/src/wrapup/Makefile.am
View File

@@ -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))
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 \
*.$(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