Fix "make depend" for out-of-tree builds.

Have mkdep take a -s argument, giving the source directory, and have it
prepend that directory to all source files before running them through
the compiler's make-dependencies operation.

diff --git a/Makefile.in b/Makefile.in
index 95b182434023a255bdf8eaf820c6f4cb12a6fd51..c23d462a7c88544ef167cb7f47aef6b9c94305c8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -470,4 +470,4 @@ testlist:
        echo $(TEST_DIST)
 
 depend: $(GENSRC)
-       $(MKDEP) -c "$(CC)" -m "$(DEPENDENCY_CFLAG)" $(DEFS) $(INCLS) $(SRC) $(LIBNETDISSECT_SRC)
+       $(MKDEP) -c "$(CC)" -m "$(DEPENDENCY_CFLAG)" -s "$(srcdir)" $(DEFS) $(INCLS) $(SRC) $(LIBNETDISSECT_SRC)

diff --git a/mkdep b/mkdep
index 1486b185aa4341c22f88fbc60755284b6ac25442..656ca099fdbbc91b43385d028aaa288ce44d59bc 100755 (executable)
--- a/mkdep
+++ b/mkdep
@@ -16,7 +16,10 @@
 MAKE=Makefile                  # default makefile name is "Makefile"
 CC=cc                          # default C compiler is "cc"
 DEPENDENCY_CFLAG=-M            # default dependency-generation flag is -M
+SOURCE_DIRECTORY=.             # default source directory is the current directory
 
+# No command-line flags seen yet.
+flags=""
 while :
        do case "$1" in
                # -c allows you to specify the C compiler
@@ -39,13 +42,24 @@ while :
                -p)
                        SED='s;\.o;;'
                        shift ;;
+
+               # -s allows you to specify the source directory
+               -s)
+                       SOURCE_DIRECTORY=$2
+                       shift; shift ;;
+
+               # other command-line flag
+               -*)
+                       flags="$flags $1"
+                       shift ;;
+
                *)
                        break ;;
        esac
 done
 
 if [ $# = 0 ] ; then
-       echo 'usage: mkdep [-p] [-c cc] [-f makefile] [-m dependency-cflag] [flags] file ...'
+       echo 'usage: mkdep [-p] [-c cc] [-f makefile] [-m dependency-cflag] [-s source-directory] [flags] file ...'
        exit 1
 fi
 
@@ -76,8 +90,17 @@ _EOF_
 # egrep '^#include[    ]*".*"' /dev/null $* |
 # sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' -e 's/\.c/.o/' |
 
+#
+# Construct a list of source files with paths relative to the source directory.
+#
+sources=""
+for srcfile in $*
+do
+       sources="$sources $SOURCE_DIRECTORY/$srcfile"
+done
+
 # XXX this doesn't work with things like "-DDECLWAITSTATUS=union\ wait"
-$CC $DEPENDENCY_CFLAG $* |
+$CC $DEPENDENCY_CFLAG $flags $sources |
 sed "
        s; \./; ;g
        $SED" |