before including <pth.h>:

[openldap] / build / mkdep

diff --git a/build/mkdep b/build/mkdep
index f2eb6da6827dc5bbccefa1c75e1362cf64f552f1..d2e316865ee29d9373d15f787c4baf30b201fb46 100755 (executable)
--- a/build/mkdep
+++ b/build/mkdep
@@ -1,7 +1,8 @@
 #! /bin/sh -
-# Copyright 1998,1999 The OpenLDAP Foundation
-# COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-# of this package for details.
+# $OpenLDAP$
+## Copyright 1998-2000 The OpenLDAP Foundation
+## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
+## of this package for details.
 #
 # Portions
 # Copyright (c) 1987 Regents of the University of California.
@@ -34,6 +35,10 @@ SED=cat
 
 : ${CC=cc}                                     # use cc by default
 
+# We generally set these via the command line options
+: ${MKDEP_CC=$CC}                      # select default compiler to generate dependencies
+: ${MKDEP_CFLAGS="-M"} # cc -M usually produces dependencies
+
 while :
        do case "$1" in
                # the -s flag removes dependencies to files that begin with /
@@ -51,21 +56,15 @@ while :
                        SRCDIR=$2
                        shift; shift ;;
 
-               # -c allows you to override the default compiler.
+               # -c allows you to override the compiler used to generate dependencies
                -c)
-                       CC=$2
-                       shift; shift ;;
-
-               # -m allows you to override the compiler used to generate
-               # dependencies.
-               -m)
-                       CC_MKDEP=$2
+                       MKDEP_CC=$2
                        shift; shift ;;
 
                # -m allows you to override the compiler flags used to generate
                # dependencies.
-               -x)
-                       CC_MKDEP_FLAGS=$2
+               -m)
+                       MKDEP_CFLAGS=$2
                        shift; shift ;;
 
                # the -p flag produces "program: program.c" style dependencies
@@ -74,7 +73,6 @@ while :
                        SED='sed -e s;\.o;;'
                        shift ;;
 
-
                # the -l flag produces libtool compatible dependencies
                -l)
                        SED='sed -e s;\.o:;.lo:;'
@@ -87,11 +85,8 @@ while :
        esac
 done
 
-: ${CC_MKDEP=$CC}                      # select default compiler to generate dependencies
-: ${CC_MKDEP_FLAGS="-M"}       # cc -M usually produces dependencies
-
 if test $# = 0 ; then
-       echo 'usage: mkdep [-p] [-s] [-c cc] [-m cc] [-x flags] [-f makefile] [-d srcdir] [cppflags] file ...'
+       echo 'usage: mkdep [-p] [-s] [-c cc] [-m flags] [-f makefile] [-d srcdir] [cppflags] file ...'
        exit 1
 fi
 
@@ -136,41 +131,44 @@ else
                fi
        done
 
-       CC_MKDEP_FLAGS="$CC_MKDEP_FLAGS -I$SRCDIR"
+       MKDEP_CFLAGS="$MKDEP_CFLAGS -I$SRCDIR"
 fi
 
 cat << _EOF_ >> $TMP
 
 #
 # files: $*
-# command: $CC_MKDEP $CC_MKDEP_FLAGS $files
+# command: $MKDEP_CC $MKDEP_CFLAGS $files
 #
 
 _EOF_
 
-$CC_MKDEP $CC_MKDEP_FLAGS $files | \
+$MKDEP_CC $MKDEP_CFLAGS $files | \
        sed -e 's; \./; ;g' | \
        $SED > $TMP.sed
-# dont pipe to awk.  SGI awk wants a filename as argument.
+# do not pipe to awk.  SGI awk wants a filename as argument.
 # (or '-', but I do not know if all other awks support that.)
 awk '
-$1 ~ /:/ {
-       filenm=$1;
-       dep=substr($0, length(filenm)+1);
+$1 ~ /:$/ {
+       filenm=$1
+       dep=substr($0, length(filenm)+1)
 }
-$1 !~ /:/ {
-       dep=$0;
+$1 !~ /:$/ {
+       dep=$0
 }
 /.*/ {
-       split(dep, depends, " ");
+       if ( length(filenm) < 2 ) next
+       if ( filenm ~ /:.*:$/ ) next
+       split(dep, depends, " ")
        for(d in depends) {
-               dfile = depends[d];
-               if (( noslash == "yes") && (dfile ~ /^\// )) next
+               dfile = depends[d]
                if ( length(dfile) < 2 ) continue
-               rec = filenm " " dfile;
-               print rec;
+               if ( dfile ~ /:/ ) continue
+               if (( noslash == "yes") && (dfile ~ /^\// )) continue
+               rec = filenm " " dfile
+               print rec
        }
-    }
+}
 ' noslash="$NOSLASH" $TMP.sed >> $TMP