diff options
-rw-r--r-- | demos/engines/cluster_labs/Makefile.in | 6 | ||||
-rw-r--r-- | demos/engines/ibmca/Makefile.in | 6 | ||||
-rw-r--r-- | demos/engines/rsaref/Makefile.in | 6 | ||||
-rw-r--r-- | demos/engines/zencod/Makefile.in | 6 | ||||
-rwxr-xr-x | util/clean-depend.pl | 81 | ||||
-rwxr-xr-x | util/domd | 33 |
6 files changed, 14 insertions, 124 deletions
diff --git a/demos/engines/cluster_labs/Makefile.in b/demos/engines/cluster_labs/Makefile.in index 48f696c85c..af842756eb 100644 --- a/demos/engines/cluster_labs/Makefile.in +++ b/demos/engines/cluster_labs/Makefile.in @@ -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. diff --git a/demos/engines/ibmca/Makefile.in b/demos/engines/ibmca/Makefile.in index d0d74dffdf..3f3d327249 100644 --- a/demos/engines/ibmca/Makefile.in +++ b/demos/engines/ibmca/Makefile.in @@ -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. diff --git a/demos/engines/rsaref/Makefile.in b/demos/engines/rsaref/Makefile.in index 94af60c401..fea17a49dd 100644 --- a/demos/engines/rsaref/Makefile.in +++ b/demos/engines/rsaref/Makefile.in @@ -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. diff --git a/demos/engines/zencod/Makefile.in b/demos/engines/zencod/Makefile.in index 240ae7dae8..f4dd7c8b67 100644 --- a/demos/engines/zencod/Makefile.in +++ b/demos/engines/zencod/Makefile.in @@ -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. diff --git a/util/clean-depend.pl b/util/clean-depend.pl deleted file mode 100755 index f29192f246..0000000000 --- a/util/clean-depend.pl +++ /dev/null @@ -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"; @@ -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 |