generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove clean-depend

Browse Source 
Remove depend hacks from demos/engines.
Remove clean-depend; just call makedepend (or $CC -M) and use that.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2016-01-21 10:29:38 -05:00 committed by Rich Salz
parent aea6116146
commit 96d608beb0
6 changed files with 14 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/engines/cluster_labs/Makefile.in
View File

@ -89,11 +89,5 @@ $(SHLIB).aix: $(LIB)
touch $(SHLIB).aix
depend:
sed -e '/^# DO NOT DELETE.*/,$$d' < Makefile > Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
gcc -M $(CFLAGS) $(SRC) >> Makefile.tmp
perl ../../../util/clean-depend.pl < Makefile.tmp > Makefile.new
rm -f Makefile.tmp Makefile
mv Makefile.new Makefile
# DO NOT DELETE THIS LINE -- make depend depends on it.

6
demos/engines/ibmca/Makefile.in
View File

@ -89,11 +89,5 @@ $(SHLIB).aix: $(LIB)
touch $(SHLIB).aix
depend:
sed -e '/^# DO NOT DELETE.*/,$$d' < Makefile > Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
gcc -M $(CFLAGS) $(SRC) >> Makefile.tmp
perl ../../../util/clean-depend.pl < Makefile.tmp > Makefile.new
rm -f Makefile.tmp Makefile
mv Makefile.new Makefile
# DO NOT DELETE THIS LINE -- make depend depends on it.

6
demos/engines/rsaref/Makefile.in
View File

@ -110,11 +110,5 @@ $(SHLIB).aix: $(LIB) install/librsaref.a
touch $(SHLIB).aix
depend:
sed -e '/^# DO NOT DELETE.*/,$$d' < Makefile > Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
gcc -M $(CFLAGS) $(SRC) >> Makefile.tmp
perl ../../../util/clean-depend.pl < Makefile.tmp > Makefile.new
rm -f Makefile.tmp Makefile
mv Makefile.new Makefile
# DO NOT DELETE THIS LINE -- make depend depends on it.

6
demos/engines/zencod/Makefile.in
View File

@ -89,11 +89,5 @@ $(SHLIB).aix: $(LIB)
touch $(SHLIB).aix
depend:
sed -e '/^# DO NOT DELETE.*/,$$d' < Makefile > Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
gcc -M $(CFLAGS) $(SRC) >> Makefile.tmp
perl ../../../util/clean-depend.pl < Makefile.tmp > Makefile.new
rm -f Makefile.tmp Makefile
mv Makefile.new Makefile
# DO NOT DELETE THIS LINE -- make depend depends on it.

81
util/clean-depend.pl
View File

@ -1,81 +0,0 @@
#!/usr/local/bin/perl -w
# Clean the dependency list in a makefile of standard includes...
# Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
use strict;
use Cwd;
my $path = getcwd();
$path =~ /([^\/]+)$/;
$path = $1;
while(<STDIN>) {
print;
last if /^# DO NOT DELETE THIS LINE/;
}
my %files;
# Fetch all the dependency output first
my $thisfile="";
while(<STDIN>) {
my ($dummy, $file,$deps)=/^((.*):)? (.*)$/;
$thisfile=$file if defined $file;
next if !defined $deps;
my @deps=split ' ',$deps;
@deps=grep(!/^\\$/,@deps);
push @{$files{$thisfile}},@deps;
}
my $file;
# Time to clean out possible system directories and normalise quirks
# from different makedepend methods
foreach $file (sort keys %files) {
# This gets around a quirk with gcc, which removes all directory
# information from the original file
my $tmpfile=$file;
$tmpfile=~s/\.o$/.c/;
(my $origfile)=grep(/(^|\/)${tmpfile}$/,@{$files{$file}});
my $newfile=$origfile;
$newfile=~s/\.c$/.o/;
if ($newfile ne $file) {
$files{$newfile} = $files{$file};
delete $files{$file};
$file = $newfile;
}
@{$files{$file}} =
grep(!/^\//,
grep(!/^$origfile$/, @{$files{$file}}));
}
foreach $file (sort keys %files) {
my $len=0;
my $dep;
my $origfile=$file;
$origfile=~s/\.o$/.c/;
$file=~s/^\.\///;
push @{$files{$file}},$origfile;
my $prevdep="";
# Remove leading ./ before sorting
my @deps = map { $_ =~ s/^\.\///; $_ } @{$files{$file}};
# Remove ../thisdir/
@deps = map { $_ =~ s|^../$path/||; $_ } @deps;
foreach $dep (sort @deps) {
$dep=~s/^\.\///;
next if $prevdep eq $dep; # to exterminate duplicates...
$prevdep = $dep;
$len=0 if $len+length($dep)+1 >= 80;
if($len == 0) {
print "\n$file:";
$len=length($file)+1;
}
print " $dep";
$len+=length($dep)+1;
}
}
print "\n";

33
util/domd
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Do a makedepend, only leave out the standard headers
# Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
# Wrapper to portably run makedepend or equivalent compiler built-in.
# Runs on Makefile.in, generates Makefile
TOP=$1
shift
@ -13,27 +13,22 @@ if [ "$1" = "-MD" ]; then
shift
fi
fi
if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
if [ -z "$MAKEDEPEND" ] ; then
MAKEDEPEND=makedepend
fi
cp Makefile Makefile.save
if ${MAKEDEPEND} --version 2>&1 | grep "clang" > /dev/null ||
echo $MAKEDEPEND | grep "gcc" > /dev/null; then
if ${MAKEDEPEND} --version 2>&1 | egrep "clang|gcc" >/dev/null
args=""
while [ $# -gt 0 ]; do
if [ "$1" != "--" ]; then args="$args $1"; fi
if [ "$1" != '--' ] ; then
args="$args $1"
fi
shift
done
sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
${MAKEDEPEND} -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp || exit 1
${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
RC=$?
rm -f Makefile.tmp
${MAKEDEPEND} -Werror -DOPENSSL_DOING_MAKEDEPEND -M $args >Makefile.tmp || exit 1
cat Makefile.in Makefile.tmp >Makefile
rm Makefile.tmp
else
${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@ && \
${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
RC=$?
cp Makefile.in Makefile
${MAKEDEPEND} -DOPENSSL_DOING_MAKEDEPEND $@ || exit 1
fi
mv Makefile.new Makefile
exit $RC