mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-13 10:32:57 +01:00
- fixed makedepend.* scripts to work in paths containing '.o*'
(contributed by Per-Erik Björkstad, Håkan Bengtsen)
This commit is contained in:
parent
ea666bb16b
commit
98960a25a5
@ -21,4 +21,4 @@ shift
|
||||
dir4=$1
|
||||
shift
|
||||
|
||||
CC -xM1 $@ $source | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
CC -xM1 $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
|
@ -23,5 +23,5 @@ shift
|
||||
|
||||
tmpfile=`basename $target`
|
||||
aCC -E +maked $@ $source >/dev/null
|
||||
sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" <$tmpfile >$target
|
||||
sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" <$tmpfile >$target
|
||||
rm $tmpfile
|
||||
|
@ -28,4 +28,4 @@ else
|
||||
CLANG=clang++
|
||||
fi
|
||||
|
||||
$CLANG -MM $@ $source | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
$CLANG -MM $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
|
@ -21,4 +21,4 @@ shift
|
||||
dir4=$1
|
||||
shift
|
||||
|
||||
cxx -M $@ $source | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
cxx -M $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
|
@ -21,4 +21,4 @@ shift
|
||||
dir4=$1
|
||||
shift
|
||||
|
||||
$CC -MM $@ $source | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
$CC -MM $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
|
@ -20,4 +20,4 @@ shift
|
||||
dir4=$1
|
||||
shift
|
||||
|
||||
$CC -E -Wp,-MM $@ $source | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
$CC -E -Wp,-MM $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
|
@ -27,5 +27,5 @@ $CXX -qmakedep -E -w $@ $cwd/$source >/dev/null
|
||||
|
||||
ufile=`basename $source`
|
||||
ufile=`echo $ufile | sed "s#\.cpp#\.u#"`
|
||||
cat $ufile | sort | uniq | grep -v '/usr/include' | grep -v '/usr/vacpp' | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
cat $ufile | sort | uniq | grep -v '/usr/include' | grep -v '/usr/vacpp' | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user