X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Fmkdep;h=2d62ae2141f4e700a06cceaf9203ea159fdeca75;hb=d130b7422f4001e0dea0fa5e55cb799557f1923c;hp=e855d2bfddf949431f532e481b5c93eb4807bd9a;hpb=835eff719ac1fee49311deec2cb6dbbc4596d28a;p=openldap
diff --git a/build/mkdep b/build/mkdep
index e855d2bfdd..2d62ae2141 100755
--- a/build/mkdep
+++ b/build/mkdep
@@ -1,23 +1,32 @@
#! /bin/sh -
-# Copyright 1998,1999 The OpenLDAP Foundation
-# COPYING RESTRICTIONS APPLY. See COPYRIGHT File in top level directory
-# of this package for details.
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2007 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
#
-# Portions
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley. The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+## Portions Copyright (c) 1987 Regents of the University of California.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms are permitted
+## provided that the above copyright notice and this paragraph are
+## duplicated in all such forms and that any documentation,
+## advertising materials, and other materials related to such
+## distribution and use acknowledge that the software was developed
+## by the University of California, Berkeley. The name of the
+## University may not be used to endorse or promote products derived
+## from this software without specific prior written permission.
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+## IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+## WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# @(#)mkdep.sh 5.12 (Berkeley) 6/30/88
#
@@ -29,11 +38,15 @@ set -e # exit immediately if any errors occur
MAKE=Makefile # default makefile name is "Makefile"
NOSLASH="no" # by default, / dependencies are included
-CC=${CC_MKDEP-${CC-cc}} # default compiler is cc
-: ${CC_MKDEP_FLAGS="-M"} # cc -M usually produces dependencies
SRCDIR=""
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,9 +64,15 @@ while :
SRCDIR=$2
shift; shift ;;
- # -c allows you to select a compiler to use (default is cc)
+ # -c allows you to override the compiler used to generate dependencies
-c)
- [ -z "$CC_MKDEP" ] && CC=$2
+ MKDEP_CC=$2
+ shift; shift ;;
+
+ # -m allows you to override the compiler flags used to generate
+ # dependencies.
+ -m)
+ MKDEP_CFLAGS=$2
shift; shift ;;
# the -p flag produces "program: program.c" style dependencies
@@ -62,7 +81,6 @@ while :
SED='sed -e s;\.o;;'
shift ;;
-
# the -l flag produces libtool compatible dependencies
-l)
SED='sed -e s;\.o:;.lo:;'
@@ -75,12 +93,12 @@ while :
esac
done
-if [ $# = 0 ] ; then
- echo 'usage: mkdep [-p] [-s] [-c cc] [-f makefile] [-d srcdir] [flags] file ...'
+if test $# = 0 ; then
+ echo 'usage: mkdep [-p] [-s] [-c cc] [-m flags] [-f makefile] [-d srcdir] [cppflags] file ...'
exit 1
fi
-if [ ! -w $MAKE ]; then
+if test ! -w $MAKE ; then
echo "mkdep: no writeable file \"$MAKE\""
exit 1
fi
@@ -99,13 +117,11 @@ cat << _EOF_ >> $TMP
_EOF_
-# If your compiler doesn't have -M, add it. If you can't, the next two
-# lines will try and replace the "cc -M". The real problem is that this
-# hack can't deal with anything that requires a search path, and doesn't
-# even try for anything using bracket (<>) syntax.
-#
-# egrep '^#include[ ]*".*"' /dev/null $* |
-# sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' -e 's/\.c/.o/' |
+# If your compiler doesn't have -M, you may be able to use -E instead.
+# The preprocessor must generate lines of the form
+# #.* [0-9]* "dependent file" .*
+# This script will parse out the "dependent file"s to generate the
+# dependency list.
if test "x$SRCDIR" = "x" ; then
files=$*
@@ -120,42 +136,80 @@ else
files="$files $i"
fi
done
- CC="$CC -I$SRCDIR"
+
+ MKDEP_CFLAGS="$MKDEP_CFLAGS -I$SRCDIR"
fi
cat << _EOF_ >> $TMP
#
# files: $*
-# command: $CC $CC_MKDEP_FLAGS $files
+# command: $MKDEP_CC $MKDEP_CFLAGS $files
#
_EOF_
-$CC $CC_MKDEP_FLAGS $files | \
- sed -e 's; \./; ;g' | \
+case $MKDEP_CFLAGS in
+# Using regular preprocessor output
+ -E*)
+FLAGS=""
+FILES=""
+for i in $files; do
+ case $i in
+ -*) FLAGS="$FLAGS $i" ;;
+ *) FILES="$FILES $i" ;;
+ esac
+done
+for i in $FILES; do
+ $MKDEP_CC $MKDEP_CFLAGS $FLAGS $i | grep '^#.*"' > $TMP.sed
+awk '
+BEGIN {
+ file = "'$i'"
+ n = split(file, parts, "/")
+ filenm = substr(parts[n], 0, length(parts[n])-1) "o"
+}
+{
+ dep = split($3, parts, "\"")
+ dep = parts[2]
+ if (dep ~ "^\./.*") dep = substr(dep, 3, length(dep)-2)
+ if (( noslash == "yes") && (dep ~ /^\// )) continue
+ if (deps[dep] == 0) printf "%s: %s\n", filenm, dep
+ deps[dep] = 1
+}' noslash="$NOSLASH" $TMP.sed >> $TMP
+done
+ ;;
+
+ *)
+# Using -M or some other specific dependency-generating option
+$MKDEP_CC $MKDEP_CFLAGS $files | \
+ sed -e 's; \./; ;g' -e 's/ :/:/' | \
$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
+ ;;
+esac
cat << _EOF_ >> $TMP