Updated.

1 files changed, 30 insertions, 27 deletions

diff --git a/os2/diff.mkdep b/os2/diff.mkdep
index 595d260238..86d3e0c0a2 100644
--- a/os2/diff.mkdep
+++ b/os2/diff.mkdep
@@ -1,18 +1,5 @@
-diff -cr ..\perl5os2.patch\perl5.001m.andy/makedepend.SH ./makedepend.SH
-*** ../perl5os2.patch/perl5.001m.andy/makedepend.SH	Mon Oct 09 21:41:04 1995
---- ./makedepend.SH	Thu Sep 28 00:00:28 1995
-***************
-*** 43,48 ****
---- 43,51 ----
-  	;;
-  esac
-  
-+ # In case Configure is not patched:
-+ : ${firstmakefile=makefile}
-+ 
-  # We need .. when we are in the x2p directory if we are using the
-  # cppstdin wrapper script.
-  # Put .. and . first so that we pick up the present cppstdin, not
+*** makedepend.SH.orig	Wed Aug 30 19:55:44 1995
+--- makedepend.SH	Sun Nov 26 14:59:34 1995
 ***************
 *** 53,69 ****
   $cat /dev/null >.deptmp
@@ -32,7 +19,7 @@ diff -cr ..\perl5os2.patch\perl5.001m.andy/makedepend.SH ./makedepend.SH
   	-e    N				\
   	-e    's/\$\*\.c//'		\
   	-e    's/^.*\n[	 ]*//p'		\
---- 56,72 ----
+--- 53,69 ----
   $cat /dev/null >.deptmp
   $rm -f *.c.c c/*.c.c
   if test -f Makefile; then
@@ -41,12 +28,12 @@ diff -cr ..\perl5os2.patch\perl5.001m.andy/makedepend.SH ./makedepend.SH
 ! mf=$firstmakefile
   if test -f $mf; then
       defrule=`<$mf sed -n		\
-! 	-e '/^\.c\$(O_REGEXP):.*;/{'		\
+! 	-e '/^\.c\(\$(OBJ_EXT)\|\.o\):.*;/{'	\
   	-e    's/\$\*\.c//'		\
   	-e    's/^[^;]*;[	 ]*//p'	\
   	-e    q				\
   	-e '}'				\
-! 	-e '/^\.c\$(O_REGEXP): *$/{'		\
+! 	-e '/^\.c\(\$(OBJ_EXT)\|\.o\): *$/{'	\
   	-e    N				\
   	-e    's/\$\*\.c//'		\
   	-e    's/^.*\n[	 ]*//p'		\
@@ -59,7 +46,7 @@ diff -cr ..\perl5os2.patch\perl5.001m.andy/makedepend.SH ./makedepend.SH
       ( $echo "#line 1 \"$file\""; \
         $sed -n <$file \
   	-e "/^${filebase}_init(/q" \
---- 94,100 ----
+--- 91,97 ----
       */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;;
       *)   finc= ;;
       esac
@@ -77,16 +64,32 @@ diff -cr ..\perl5os2.patch\perl5.001m.andy/makedepend.SH ./makedepend.SH
   	-e 's|: \./|: |' \
   	-e 's|\.c\.c|.c|' | \
       $uniq | $sort | $uniq >> .deptmp
---- 110,117 ----
+--- 107,114 ----
   	-e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
   	-e 's/^[	 ]*#[	 ]*line/#/' \
   	-e '/^# *[0-9][0-9]* *[".\/]/!d' \
-! 	-e 's/^.*"\(.*\)".*$/'$filebase'\$(O): \1/' \
-! 	-e 's/^# *[0-9][0-9]* \(.*\)$/'$filebase'\$(O): \1/' \
+! 	-e 's/^.*"\(.*\)".*$/'$filebase'\$(OBJ_EXT): \1/' \
+! 	-e 's/^# *[0-9][0-9]* \(.*\)$/'$filebase'\$(OBJ_EXT): \1/' \
   	-e 's|: \./|: |' \
   	-e 's|\.c\.c|.c|' | \
       $uniq | $sort | $uniq >> .deptmp
 ***************
+*** 118,123 ****
+--- 118,130 ----
+  
+  $MAKE shlist || ($echo "Searching for .SH files..."; \
+  	$echo *.SH | $tr ' ' '\012' | $egrep -v '\*' >.shlist)
++ 
++ # Now extract the dependency on makedepend.SH
++ # (it should reside in the main Makefile):
++ mv .shlist .shlist.old
++ $egrep -v '^makedepend\.SH' <.shlist.old >.shlist
++ rm .shlist.old
++ 
+  if $test -s .deptmp; then
+      for file in `cat .shlist`; do
+  	$echo `$expr X$file : 'X\(.*\).SH'`: $file $TOP/config.sh \; \
+***************
 *** 126,132 ****
       $echo "Updating $mf..."
       $echo "# If this runs make out of memory, delete /usr/include lines." \
@@ -95,11 +98,11 @@ diff -cr ..\perl5os2.patch\perl5.001m.andy/makedepend.SH ./makedepend.SH
          >>$mf.new
   else
       $MAKE hlist || ($echo "Searching for .h files..."; \
---- 129,135 ----
+--- 133,139 ----
       $echo "Updating $mf..."
       $echo "# If this runs make out of memory, delete /usr/include lines." \
   	>> $mf.new
-!     $sed 's|^\(.*\$(O_REGEXP):\) *\(.*/.*\.c\) *$|\1 \2; '"$defrule \2|" .deptmp \
+!     $sed 's|^\(.*\(\$(OBJ_EXT)\|\.o\):\) *\(.*/.*\.c\) *$|\1 \3; '"$defrule \2|" .deptmp \
          >>$mf.new
   else
       $MAKE hlist || ($echo "Searching for .h files..."; \
@@ -115,14 +118,14 @@ diff -cr ..\perl5os2.patch\perl5.001m.andy/makedepend.SH ./makedepend.SH
       <.hlist $sed -n 's|\(.*/\)\(.*\)|s= \2= \1\2=|p' >.hsed
       <.deptmp $sed -n 's|c:#include "\(.*\)".*$|o: \1|p' | \
          $sed 's|^[^;]*/||' | \
---- 139,148 ----
+--- 143,152 ----
       $echo "Updating $mf..."
       <.clist $sed -n							\
   	-e '/\//{'							\
-! 	-e   's|^\(.*\)/\(.*\)\.c|\2\$(O): \1/\2.c; '"$defrule \1/\2.c|p"	\
+! 	-e   's|^\(.*\)/\(.*\)\.c|\2\$(OBJ_EXT): \1/\2.c; '"$defrule \1/\2.c|p"	\
   	-e   d								\
   	-e '}'								\
-! 	-e 's|^\(.*\)\.c|\1\$(O): \1.c|p' >> $mf.new
+! 	-e 's|^\(.*\)\.c|\1\$(OBJ_EXT): \1.c|p' >> $mf.new
       <.hlist $sed -n 's|\(.*/\)\(.*\)|s= \2= \1\2=|p' >.hsed
       <.deptmp $sed -n 's|c:#include "\(.*\)".*$|o: \1|p' | \
          $sed 's|^[^;]*/||' | \