Merge remote-tracking branch 'rosslagerwall/tree-build'

This commit is contained in:
Nick Mathewson 2013-09-16 12:29:48 -04:00
commit 0a051ef93c
2 changed files with 3 additions and 2 deletions

View File

@ -107,7 +107,7 @@ test_regress_SOURCES += test/regress_iocp.c
endif
test_regress_LDADD = $(LIBEVENT_GC_SECTIONS) libevent.la $(PTHREAD_LIBS) $(ZLIB_LIBS)
test_regress_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
test_regress_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS) -Itest
test_regress_LDFLAGS = $(PTHREAD_CFLAGS)
if OPENSSL

View File

@ -37,7 +37,8 @@ fi
srcdir=$1
srcdir=${srcdir:-.}
${PYTHON2} ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc
${PYTHON2} ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc \
test/regress.gen.h test/regress.gen.c
case "$?" in
0)