diff options
| author | Internet Software Consortium, Inc <@isc.org> | 2012-01-18 10:11:16 -0700 |
|---|---|---|
| committer | Internet Software Consortium, Inc <@isc.org> | 2012-01-18 10:11:16 -0700 |
| commit | f8bb4eefd76094703b91acc987d8df0603639376 (patch) | |
| tree | e2b41a79e5cee716e4c8b9c07c83910509e6ac2e /make | |
| parent | 8b08ed79737eaec2fd64fbecce719fc5d91c0f48 (diff) | |
| download | bind9-f8bb4eefd76094703b91acc987d8df0603639376.tar.gz | |
9.9.0rc1
Diffstat (limited to 'make')
| -rw-r--r-- | make/mkdep.in | 38 | ||||
| -rw-r--r-- | make/rules.in | 20 |
2 files changed, 35 insertions, 23 deletions
diff --git a/make/mkdep.in b/make/mkdep.in index bb536c95..8c2201f4 100644 --- a/make/mkdep.in +++ b/make/mkdep.in @@ -140,25 +140,37 @@ if [ X"${MKDEPPROG}" != X ]; then else @MKDEPCC@ @MKDEPCFLAGS@ ${newargs} | sed " - s; \./; ;g + s; \\./; ;g + s; \\\\; ;g @LIBTOOL_MKDEP_SED@ $SED" | - awk '{ - if ($1 != prev) { + awk '$1 ~ /:$/ { if (rec != "") - print rec; - rec = $0; - prev = $1; + print rec; + if (NF == 1) + rec = $1; + else + rec = $1 " " $2; + for (i = 3; i <= NF; i++) { + if (length(rec $i) > 76) { + print rec " \\"; + rec = " " $i; + } else { + rec = rec " " $i; + } + } + next; } - else { - if (length(rec $2) > 78) { - print rec; - rec = $0; + { + for (i = 1; i <= NF; i++) { + if (length(rec $i) > 76) { + print rec, "\\"; + rec = " " $i; + } else { + rec = rec " " $i; + } } - else - rec = rec " " $2 } - } END { print rec }' >> $TMP diff --git a/make/rules.in b/make/rules.in index 986b8931..4dda7372 100644 --- a/make/rules.in +++ b/make/rules.in @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: rules.in,v 1.71 2011-09-02 21:15:39 each Exp $ +# $Id: rules.in,v 1.72 2011-12-20 05:24:18 marka Exp $ ### ### Common Makefile rules for BIND 9. @@ -236,20 +236,20 @@ depend: (cd $$i; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@) || exit 1; \ fi; \ done - @if [ X"${VPATH}" != X ] ; then \ + @if [ X"${srcdir}" != X. ] ; then \ if [ X"${SRCS}" != X -a X"${PSRCS}" != X ] ; then \ - echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \ - ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \ - echo ${MKDEP} -vpath ${VPATH} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \ - ${MKDEP} -vpath ${VPATH} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \ + echo ${MKDEP} -vpath ${srcdir} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \ + ${MKDEP} -vpath ${srcdir} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \ + echo ${MKDEP} -vpath ${srcdir} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \ + ${MKDEP} -vpath ${srcdir} -ap ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \ ${DEPENDEXTRA} \ elif [ X"${SRCS}" != X ] ; then \ - echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \ - ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \ + echo ${MKDEP} -vpath ${srcdir} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \ + ${MKDEP} -vpath ${srcdir} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${SRCS}; \ ${DEPENDEXTRA} \ elif [ X"${PSRCS}" != X ] ; then \ - echo ${MKDEP} -vpath ${VPATH} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \ - ${MKDEP} -vpath ${VPATH} -p ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \ + echo ${MKDEP} -vpath ${srcdir} ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \ + ${MKDEP} -vpath ${srcdir} -p ${ALL_CPPFLAGS} ${ALL_CFLAGS} ${PSRCS}; \ ${DEPENDEXTRA} \ fi \ else \ |