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

* aclocal/env-rtemsbsp.m4: Add PROJECT_LIB.
	* automake/compile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
This commit is contained in:
Ralf Corsepius
2003-12-15 07:27:36 +00:00
parent 41fc78d379
commit d7e0507ddb
3 changed files with 8 additions and 2 deletions

View File

@@ -1,3 +1,8 @@
2003-12-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/env-rtemsbsp.m4: Add PROJECT_LIB.
* automake/compile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/lead-dot.m4: Remove (Provided by automake-1.8).

View File

@@ -46,6 +46,7 @@ includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
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"])
AC_SUBST([project_libdir],["\$(libdir)"])

View File

@@ -139,12 +139,12 @@ depend: depend-am
LINK_OBJS = \
$(OBJS) \
$(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
$(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel)
LINK_FILES =\
$(START_FILE) \
$(OBJS) \
$(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
$(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel)
if RTEMS_USE_GCC
## gcc >= 2.8