diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-15 07:27:36 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-15 07:27:36 +0000 |
| commit | d7e0507ddb4c383f7efa255ee9972fd408f256af (patch) | |
| tree | 22766c6e5a504eb28ceb4c885a1ed57e481d48f8 /testsuites | |
| parent | 2003-12-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d7e0507ddb4c383f7efa255ee9972fd408f256af.tar.bz2 | |
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.
Diffstat (limited to 'testsuites')
| -rw-r--r-- | testsuites/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuites/aclocal/env-rtemsbsp.m4 | 1 | ||||
| -rw-r--r-- | testsuites/automake/compile.am | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/testsuites/ChangeLog b/testsuites/ChangeLog index 6646fa65b9..4a34216bba 100644 --- a/testsuites/ChangeLog +++ b/testsuites/ChangeLog @@ -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). diff --git a/testsuites/aclocal/env-rtemsbsp.m4 b/testsuites/aclocal/env-rtemsbsp.m4 index 7b61f5702c..3fe9195ddd 100644 --- a/testsuites/aclocal/env-rtemsbsp.m4 +++ b/testsuites/aclocal/env-rtemsbsp.m4 @@ -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)"]) diff --git a/testsuites/automake/compile.am b/testsuites/automake/compile.am index 7132985a3e..dd889924c3 100644 --- a/testsuites/automake/compile.am +++ b/testsuites/automake/compile.am @@ -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 |