From: Perl 5 Porters Date: Fri, 15 Mar 1996 07:42:37 +0000 (+0000) Subject: Update for OS/2 support: variables for file extensions and names X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=337e9004c72eecdb1df8cf25dc6b34515433c540;p=p5sagit%2Fp5-mst-13.2.git Update for OS/2 support: variables for file extensions and names --- diff --git a/makedepend.SH b/makedepend.SH index 3fa095c..acd9d7e 100755 --- a/makedepend.SH +++ b/makedepend.SH @@ -53,17 +53,17 @@ export PATH $cat /dev/null >.deptmp $rm -f *.c.c c/*.c.c if test -f Makefile; then - cp Makefile makefile + cp Makefile $firstmakefile fi -mf=makefile +mf=$firstmakefile if test -f $mf; then defrule=`<$mf sed -n \ - -e '/^\.c\.o:.*;/{' \ + -e '/^\.c\(\$(OBJ_EXT)\|\.o\):.*;/{' \ -e 's/\$\*\.c//' \ -e 's/^[^;]*;[ ]*//p' \ -e q \ -e '}' \ - -e '/^\.c\.o: *$/{' \ + -e '/^\.c\(\$(OBJ_EXT)\|\.o\): *$/{' \ -e N \ -e 's/\$\*\.c//' \ -e 's/^.*\n[ ]*//p' \ @@ -91,7 +91,7 @@ for file in `$cat .clist`; do */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;; *) finc= ;; esac - $echo "Finding dependencies for $filebase.o." + $echo "Finding dependencies for $filebase$obj_ext." ( $echo "#line 1 \"$file\""; \ $sed -n <$file \ -e "/^${filebase}_init(/q" \ @@ -107,8 +107,8 @@ for file in `$cat .clist`; do -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,6 +118,13 @@ $sed <$mf >$mf.new -e '1,/^# AUTOMATICALLY/!d' $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,7 +133,7 @@ if $test -s .deptmp; then $echo "Updating $mf..." $echo "# If this runs make out of memory, delete /usr/include lines." \ >> $mf.new - $sed 's|^\(.*\.o:\) *\(.*/.*\.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..."; \ @@ -136,10 +143,10 @@ else $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|^[^;]*/||' | \