More dependency-tracking bug fixes

diff --git a/automake.in b/automake.in
index 0cfdd7009ad4f7aa9af4ccef74395c4741411113..cbf4c3ce37c3a05fdba44679e33a5ba86faf5510 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -212,10 +212,12 @@ p
 }" >&4
          fi
          SOURCES="$SOURCES \${${am_file}_SOURCES}"
+         OBJECTS="$OBJECTS \${${am_file}_OBJECTS}"
        else
          echo "${am_file}_SOURCES = ${am_file}.c" >&4
          echo "${am_file}_OBJECTS = ${am_file}.${kr}o" >&4
           SOURCES="$SOURCES ${am_file}.c"
+         OBJECTS="$OBJECTS ${am_file}.${kr}o"
        fi
        if test -n "$CONFIG_HEADER"; then
          echo "\$(${am_file}_OBJECTS): $CONFIG_HEADER" >&5
@@ -310,7 +312,7 @@ p
   esac
 
   echo "SOURCES = $SOURCES" >&4
-
+  echo "OBJECTS = $OBJECTS" >&4
 
   #
   # Handle TAGS.
@@ -378,17 +380,14 @@ p
   #
   # Handle auto-generating dependencies.
   #
-  if test "$am_usedeps" = yes; then
-     if test -n "$SOURCES"; then
-       # Include code to auto-generate dependencies.
-       cat $am_dir/depend.am >&5
-     fi
-  else
-     if test "$am_incdeps" = yes; then
-       # Include any already generated dependencies.
-       if test -d .deps && test -f .deps/empty.P; then
-          cat .deps/*.P >&5
-       fi
+  if test "$am_usedeps" = yes && test -n "$SOURCES"; then
+     # Include code to auto-generate dependencies.
+     cat $am_dir/depend.am >&5
+  fi
+  if test "$am_incdeps" = yes; then
+     # Include any already generated dependencies.
+     if test -d $am_reldir/.deps && test -f $am_reldir/.deps/empty.P; then
+       cat $am_reldir/.deps/*.P >&5
      fi
   fi