walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Remove AM_EXTRA_RECURSIVE_TARGETS since travis automake is too old

This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-21 02:07:16 +09:00
parent 8997e4369d
commit 9938a4e952
6 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -189,7 +189,7 @@ its testing framework. We depends on the following libraries:
* https://golang.org/x/net/spdy * https://golang.org/x/net/spdy
To run the tests, after installing above packages and their To run the tests, after installing above packages and their
dependencies, run:: dependencies, enter ``integration-tests`` directory and run::
$ make it $ make it

4
configure.ac
View File

@ -49,7 +49,9 @@ AC_CANONICAL_TARGET
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([subdir-objects]) AM_INIT_AUTOMAKE([subdir-objects])
AM_EXTRA_RECURSIVE_TARGETS([it]) # comment out for now since this requires automake 1.13 or higher and
# travis has older one.
# AM_EXTRA_RECURSIVE_TARGETS([it])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

2
integration-tests/Makefile.am
View File

@ -25,5 +25,5 @@ EXTRA_DIST = \
nghttpx_test.go \ nghttpx_test.go \
server_tester.go server_tester.go
it-local: it:
sh setenv go test -v sh setenv go test -v

2
lib/Makefile.am
View File

@ -63,5 +63,3 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS) libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
libnghttp2_la_LDFLAGS = -no-undefined \ libnghttp2_la_LDFLAGS = -no-undefined \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
it-local: all

2
src/Makefile.am
View File

@ -198,5 +198,3 @@ libnghttp2_asio_la_LDFLAGS = \
libnghttp2_asio_la_LIBADD = $(top_builddir)/lib/libnghttp2.la libnghttp2_asio_la_LIBADD = $(top_builddir)/lib/libnghttp2.la
endif # ENABLE_ASIO_LIB endif # ENABLE_ASIO_LIB
it-local: all

2
third-party/Makefile.am vendored
View File

@ -27,5 +27,3 @@ noinst_LTLIBRARIES = libhttp-parser.la
libhttp_parser_la_SOURCES = \ libhttp_parser_la_SOURCES = \
http-parser/http_parser.c \ http-parser/http_parser.c \
http-parser/http_parser.h http-parser/http_parser.h
it-local: all