Commit 74347f4a authored by Evan Hunt's avatar Evan Hunt

reduce race risk in parallel builds

parent d132f734
......@@ -7,14 +7,12 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
# $Id: Makefile.in,v 1.29 2009/10/05 12:07:08 fdupont Exp $
srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
SUBDIRS = named rndc dig delv dnssec tools tests nsupdate \
check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@
SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \
@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
TARGETS =
@BIND9_MAKE_RULES@
......@@ -32,8 +32,7 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
LIBS = @LIBS@
SUBDIR = system @PKCS11_TOOLS@ optional
SUBDIRS = system @PKCS11_TOOLS@
TESTDIRS = system
# Test programs that are built by default:
......@@ -43,14 +42,20 @@ TESTDIRS = system
# other opptional test programs have been moved to ./optional
# Alphabetically
XTARGETS = all_tests
TARGETS = cfg_test@EXEEXT@ makejournal@EXEEXT@ \
wire_test@EXEEXT@
wire_test@EXEEXT@ @XTARGETS@
SRCS = cfg_test.c makejournal.c wire_test.c
@BIND9_MAKE_RULES@
all_tests: subdirs
.NOTPARALLEL:
.PHONY:
all_tests:
echo "making depend in `pwd`/optional"; \
(cd optional; ${MAKE} ${MAKEDEFS} DESTDIR="${DESTDIR}" $@)
wire_test@EXEEXT@: wire_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ wire_test.@O@ \
......@@ -69,6 +74,7 @@ distclean::
clean distclean::
rm -f ${TARGETS}
( cd optional; $(MAKE) $@)
check: test
......
......@@ -39,10 +39,11 @@ TARGETS = feature-test@EXEEXT@
@BIND9_MAKE_RULES@
subdirs: ${TARGETS}
feature-test@EXEEXT@: feature-test.@O@
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
# Running the scripts below is bypassed when a separate build directory is
# used.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment