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

* aclocal/env-rtemscpu.m4: Add PROJECT_LIB.
	* wrapup/Makefile.am: Use $(PROJECT_LIB) instead of ${PROJECT_RELEASE}/lib.
This commit is contained in:
Ralf Corsepius
2003-12-13 04:10:07 +00:00
parent de3e979704
commit efe9ef4ef5
3 changed files with 20 additions and 6 deletions
+5
View File
@@ -1,3 +1,8 @@
2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/env-rtemscpu.m4: Add PROJECT_LIB.
* wrapup/Makefile.am: Use $(PROJECT_LIB) instead of ${PROJECT_RELEASE}/lib.
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.
+2
View File
@@ -15,6 +15,7 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU],
AC_SUBST(MULTISUBDIR)
AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/lib/include"])
AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/lib/\$(MULTISUBDIR)"])
AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)"])
includedir="\${exec_prefix}/include"
@@ -43,6 +44,7 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU],
libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"])
AC_SUBST([PROJECT_LIB],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib"])
AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)/$RTEMS_BSP"])
RTEMS_ENABLE_BARE
+13 -6
View File
@@ -100,12 +100,19 @@ $(ARCH)/librtemscpu$(LIB_VARIANT).a: ${LIBS}
all-local: $(TMPINSTALL_FILES)
${PROJECT_RELEASE}/lib/$(dirstamp):
@$(mkdir_p) ${PROJECT_RELEASE}/lib
@: > ${PROJECT_RELEASE}/lib/$(dirstamp)
${PROJECT_LIB}/$(dirstamp):
@$(mkdir_p) ${PROJECT_LIB}
@: > ${PROJECT_LIB}/$(dirstamp)
${PROJECT_RELEASE}/lib/librtemscpu$(LIB_VARIANT).a: $(ARCH)/librtemscpu$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp)
$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/librtemscpu$(LIB_VARIANT).a
TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/librtemscpu$(LIB_VARIANT).a
${PROJECT_LIB}/librtemscpu$(LIB_VARIANT).a: $(ARCH)/librtemscpu$(LIB_VARIANT).a ${PROJECT_LIB}/$(dirstamp)
$(INSTALL_DATA) $< ${PROJECT_LIB}/librtemscpu$(LIB_VARIANT).a
$(PROJECT_LIB)/$(dirstamp):
@$(mkdir_p) $(PROJECT_LIB)
@: > $(PROJECT_LIB)/$(dirstamp)
$(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a: $(ARCH)/librtemscpu$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a
TMPINSTALL_FILES += $(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a
include $(top_srcdir)/automake/local.am