diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-17 02:40:23 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-17 02:40:23 +0000 |
| commit | 208aa86efc95909fe94c88ea53e2e8a99a7bc195 (patch) | |
| tree | 35960a82d14023652920b645763f4ca002969f1f /c/src | |
| parent | 2004-01-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-208aa86efc95909fe94c88ea53e2e8a99a7bc195.tar.bz2 | |
2004-01-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rtems-top.m4: Remove check for version.m4.
* automake/compile.am: Remove LINK_OBJS, LINK_FILES (Unused).
Diffstat (limited to 'c/src')
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/aclocal/rtems-top.m4 | 3 | ||||
| -rw-r--r-- | c/src/automake/compile.am | 12 |
3 files changed, 5 insertions, 15 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index d9d732aea6..599e5ef9c5 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,8 @@ +2004-01-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * aclocal/rtems-top.m4: Remove check for version.m4. + * automake/compile.am: Remove LINK_OBJS, LINK_FILES (Unused). + 2004-01-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * automake/compile.am: Add RTEMS_RELLDFLAGS. diff --git a/c/src/aclocal/rtems-top.m4 b/c/src/aclocal/rtems-top.m4 index b0a6f35700..78e95c9d6d 100644 --- a/c/src/aclocal/rtems-top.m4 +++ b/c/src/aclocal/rtems-top.m4 @@ -42,9 +42,6 @@ PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)" AC_SUBST(PROJECT_ROOT) AC_MSG_CHECKING([for RTEMS Version]) -AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/aclocal/version.m4"], -[], -[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/aclocal/version.m4])]) AC_MSG_RESULT([_RTEMS_VERSION]) AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp]) diff --git a/c/src/automake/compile.am b/c/src/automake/compile.am index 79507c50a2..479ea658fa 100644 --- a/c/src/automake/compile.am +++ b/c/src/automake/compile.am @@ -132,18 +132,6 @@ include ${DEPEND} endif depend: depend-am -# spell out all the LINK_FILE's, rather than using -lbsp, so -# that $(LINK_FILES) can be a dependency - -LINK_OBJS = \ - $(OBJS) \ - $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel) - -LINK_FILES =\ - $(START_FILE) \ - $(OBJS) \ - $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel) - if RTEMS_USE_GCC ## gcc >= 2.8 RTEMS_RELLDFLAGS = -qnolinkcmds -nostdlib -Wl,-r |