X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=util%2Fdomd;h=efbfb3ab6762304b0b9e90305b8fbbdc9d4bdcaa;hb=1041ab696ef8bc5d2d91c95a2de32c8623fab97e;hp=23b7dcbade97b50d7f1cd33ef8418b0f66548267;hpb=87b79c3ef3f05e8048c762c2d214b85180e00567;p=openssl.git

diff --git a/util/domd b/util/domd
index 23b7dcbade..efbfb3ab67 100755
--- a/util/domd
+++ b/util/domd
@@ -4,19 +4,35 @@
 
 TOP=$1
 shift
-MAKEDEPEND=$1
-shift
+if [ "$1" = "-MD" ]; then
+    shift
+    MAKEDEPEND=$1
+    shift
+fi
 if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
 
-cp Makefile.ssl Makefile.save
-if [ "$MAKEDEPEND" = "gcc" ]; then
-    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp
+cp Makefile Makefile.save
+# fake the presence of Kerberos
+touch $TOP/krb5.h
+if expr "$MAKEDEPEND" : '.*cc' > /dev/null; then
+    args=""
+    while [ $# -gt 0 ]; do
+	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
-    gcc -M $@ >> Makefile.tmp
-    perl $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
-    #cat Makefile.tmp > Makefile.new
+    ${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
 else
-    ${MAKEDEPEND} -f Makefile.ssl $@
-    perl $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
+    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@ && \
+    ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
+    RC=$?
 fi
-mv Makefile.new Makefile.ssl
+mv Makefile.new Makefile
+# unfake the presence of Kerberos
+rm $TOP/krb5.h
+
+exit $RC