From nobody Fri Jan 28 23:28:09 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A94EA1995526; Fri, 28 Jan 2022 23:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JlttS0CGsz4tNn; Fri, 28 Jan 2022 23:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643412496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxzCgY5YHLKPot2Cg45mdnVxjzMiQR1cOhCNZGESyqo=; b=gL7ZhzhjDKR7PQX1J71B24CKmejcD+VkyXLURmQdv8krS4NLPHPuvR741OvRnYFLZsx+sW /GNzTeGvQGfDighxrqiF+qdEHeuwlxwtHtS3/S1FnpRdaxdxWaYrpi1YDcEljn8Vh1+FdH Nhm8Nc8rGvJm1o0gTBdGTTuZ1Yr7bYrfMsTpdTlSND5xj6NFuN+ihqIhf9AUdlJASPlRRQ qPj6nFWTsO/ioFWYEonEvMXsb5GNd9PvJohvy7RF4ItFURB8HbZyLUloTJjQrTUW3s9UvZ Gf3OvF5Muy0/Mk+VfuDaTqIsfQbxKGLTIiXPGbRaQruipJy3AFZjWgvyttPvng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9067D2D7F; Fri, 28 Jan 2022 23:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20SNS9Vs094372; Fri, 28 Jan 2022 23:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20SNS9aC094371; Fri, 28 Jan 2022 23:28:09 GMT (envelope-from git) Date: Fri, 28 Jan 2022 23:28:09 GMT Message-Id: <202201282328.20SNS9aC094371@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: f78ef7bbfffe - main - www/nghttp2: Convert REINPLACE_CMD to patch files List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f78ef7bbfffedec5827f4a1ce0608004a3bc2f8a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643412496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxzCgY5YHLKPot2Cg45mdnVxjzMiQR1cOhCNZGESyqo=; b=TeLTgj6XbpXK5EcYf3HWaB8Z3E88CETpXq8o+E8PxBKtIXr2IZc7d2WAnHJEFj5EHesTlz 5NYTh/1FaoN9GHPFD0+ggxPXOg08LdxM9VxRycRWCKau6vJ26gALYrMVUZhtAK7nc8fPPf Kx/b/alihM6AnMubnZRBYj5bL7ipFTQ8/T7y/QlQ4OilFwew00uUzVJ1mI2wG8WOFa97Az pvzTJ7Rg8X1AtkWqJaqw9VpX/B9+VlkAidaby7hg5riGmEdILY3vk5ArafzulmU8Nkc2ZF ilDO3lBj6V0VqsgzTo2t2LTg+RBy9R3kQt1rMuc+jzK0f4fvUK7XWPB42B3lag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643412496; a=rsa-sha256; cv=none; b=QMl1jfdJT0bXOFOH9ZSSGdMNg1u+7ksvfOQXQl5W1ySorS8cNW8cdiYdtaE2qLKaOURSS4 aX7Ph8wKa24ct2oMgSS2HLBZMwj9padKOwsbyMh3lQHYqycnLjwdMDxI5AAAfXshamwlK9 Uznht3Zm4Zc1Z0ScBAJevDKONVoXaF0dQVMyHkTkqlADQmU7mXDGiBFY6akG7Pup5mP4gw IeuaOPh5iIJSYlL1xgy15C+iD15wZgB4GQYLo7zEvtZaPvzFfOsIaIq+ADyY2H62wSMEwK 6wSaUrLb+7gYdWr9QWDHNr6zMoHK1uRyd+MDhuLhn26QeQ4xtunItuZvP4vbzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=f78ef7bbfffedec5827f4a1ce0608004a3bc2f8a commit f78ef7bbfffedec5827f4a1ce0608004a3bc2f8a Author: Po-Chuan Hsieh AuthorDate: 2022-01-28 23:18:54 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-01-28 23:26:40 +0000 www/nghttp2: Convert REINPLACE_CMD to patch files --- www/nghttp2/Makefile | 5 -- www/nghttp2/files/patch-Makefile.in | 11 +++ www/nghttp2/files/patch-examples-Makefile.in | 66 +++++++++++++++++ www/nghttp2/files/patch-script-fetch-ocsp-response | 7 ++ www/nghttp2/files/patch-src-Makefile.in | 83 ++++++++++++++++++++++ www/nghttp2/files/patch-tests-Makefile.in | 31 ++++++++ 6 files changed, 198 insertions(+), 5 deletions(-) diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile index 680209452960..9b2c97126857 100644 --- a/www/nghttp2/Makefile +++ b/www/nghttp2/Makefile @@ -49,11 +49,6 @@ HPACK_BUILD_DEPENDS= jansson>=2.5:devel/jansson HPACK_CONFIGURE_ENABLE= hpack-tools HPACK_LIB_DEPENDS= libjansson.so:devel/jansson -post-patch: - @${REINPLACE_CMD} -e '/^SUBDIRS = / s| lib||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|$$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' ${WRKSRC}/*/Makefile.in - @${REINPLACE_CMD} -e '1d' ${WRKSRC}/script/fetch-ocsp-response - # lib/libnghttp2.* are not available until configure phase post-configure: @${MKDIR} ${WRKSRC}/lib/.libs/ diff --git a/www/nghttp2/files/patch-Makefile.in b/www/nghttp2/files/patch-Makefile.in new file mode 100644 index 000000000000..065fc9c70ac2 --- /dev/null +++ b/www/nghttp2/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2021-10-19 09:32:30 UTC ++++ Makefile.in +@@ -464,7 +464,7 @@ top_srcdir = @top_srcdir@ + # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +-SUBDIRS = lib third-party src bpf examples python tests integration-tests \ ++SUBDIRS = third-party src bpf examples python tests integration-tests \ + doc contrib script + + diff --git a/www/nghttp2/files/patch-examples-Makefile.in b/www/nghttp2/files/patch-examples-Makefile.in new file mode 100644 index 000000000000..879b9c1885cc --- /dev/null +++ b/www/nghttp2/files/patch-examples-Makefile.in @@ -0,0 +1,66 @@ +sed -i .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' */Makefile.in + +--- examples/Makefile.in.orig 2021-10-19 09:32:30 UTC ++++ examples/Makefile.in +@@ -146,7 +146,7 @@ am__asio_cl_SOURCES_DIST = asio-cl.cc + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am_asio_cl_OBJECTS = asio_cl-asio-cl.$(OBJEXT) + asio_cl_OBJECTS = $(am_asio_cl_OBJECTS) + am__DEPENDENCIES_1 = +-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/lib/libnghttp2.la \ ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPENDENCIES_2 = -lnghttp2 \ + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/src/libnghttp2_asio.la \ + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la \ + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_1) \ +@@ -175,14 +175,14 @@ am__client_SOURCES_DIST = client.c + client_OBJECTS = $(am_client_OBJECTS) + client_LDADD = $(LDADD) + @ENABLE_EXAMPLES_TRUE@client_DEPENDENCIES = \ +-@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \ ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ + @ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la + am__deflate_SOURCES_DIST = deflate.c + @ENABLE_EXAMPLES_TRUE@am_deflate_OBJECTS = deflate.$(OBJEXT) + deflate_OBJECTS = $(am_deflate_OBJECTS) + deflate_LDADD = $(LDADD) + @ENABLE_EXAMPLES_TRUE@deflate_DEPENDENCIES = \ +-@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \ ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ + @ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la + am__libevent_client_SOURCES_DIST = libevent-client.c + @ENABLE_EXAMPLES_TRUE@am_libevent_client_OBJECTS = \ +@@ -190,7 +190,7 @@ am__libevent_client_SOURCES_DIST = libevent-client.c + libevent_client_OBJECTS = $(am_libevent_client_OBJECTS) + libevent_client_LDADD = $(LDADD) + @ENABLE_EXAMPLES_TRUE@libevent_client_DEPENDENCIES = \ +-@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \ ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ + @ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la + am__libevent_server_SOURCES_DIST = libevent-server.c + @ENABLE_EXAMPLES_TRUE@am_libevent_server_OBJECTS = \ +@@ -198,7 +198,7 @@ am__libevent_server_SOURCES_DIST = libevent-server.c + libevent_server_OBJECTS = $(am_libevent_server_OBJECTS) + libevent_server_LDADD = $(LDADD) + @ENABLE_EXAMPLES_TRUE@libevent_server_DEPENDENCIES = \ +-@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \ ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ + @ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +@@ -503,7 +503,7 @@ EXTRA_DIST = CMakeLists.txt + @ENABLE_EXAMPLES_TRUE@ @DEFS@ + + @ENABLE_EXAMPLES_TRUE@AM_LDFLAGS = @LIBTOOL_LDFLAGS@ +-@ENABLE_EXAMPLES_TRUE@LDADD = $(top_builddir)/lib/libnghttp2.la \ ++@ENABLE_EXAMPLES_TRUE@LDADD = -lnghttp2 \ + @ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la \ + @ENABLE_EXAMPLES_TRUE@ @LIBEVENT_OPENSSL_LIBS@ \ + @ENABLE_EXAMPLES_TRUE@ @OPENSSL_LIBS@ \ +@@ -518,7 +518,7 @@ EXTRA_DIST = CMakeLists.txt + # nghttp2/nghttp2.h) in this package is used rather than installed + # one. + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOCPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS} +-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOLDADD = $(top_builddir)/lib/libnghttp2.la \ ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOLDADD = -lnghttp2 \ + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/src/libnghttp2_asio.la @JEMALLOC_LIBS@ \ + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/liburl-parser.la \ + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ @OPENSSL_LIBS@ \ diff --git a/www/nghttp2/files/patch-script-fetch-ocsp-response b/www/nghttp2/files/patch-script-fetch-ocsp-response new file mode 100644 index 000000000000..e68d0f63ef0e --- /dev/null +++ b/www/nghttp2/files/patch-script-fetch-ocsp-response @@ -0,0 +1,7 @@ +--- script/fetch-ocsp-response.orig 2021-10-19 09:31:47 UTC ++++ script/fetch-ocsp-response +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # -*- coding: utf-8 -*- + + # nghttp2 - HTTP/2 C Library diff --git a/www/nghttp2/files/patch-src-Makefile.in b/www/nghttp2/files/patch-src-Makefile.in new file mode 100644 index 000000000000..e632cf924baf --- /dev/null +++ b/www/nghttp2/files/patch-src-Makefile.in @@ -0,0 +1,83 @@ +sed -i .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' */Makefile.in + +--- src/Makefile.in.orig 2021-10-19 09:32:30 UTC ++++ src/Makefile.in +@@ -318,7 +318,7 @@ am__libnghttpx_a_SOURCES_DIST = util.cc util.h http2.c + libnghttpx_a_OBJECTS = $(am_libnghttpx_a_OBJECTS) + am__DEPENDENCIES_1 = + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_DEPENDENCIES = \ +-@ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/lib/libnghttp2.la \ ++@ENABLE_ASIO_LIB_TRUE@ -lnghttp2 \ + @ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/third-party/liburl-parser.la \ + @ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/third-party/libllhttp.la \ + @ENABLE_ASIO_LIB_TRUE@ $(am__DEPENDENCIES_1) \ +@@ -392,7 +392,7 @@ am__deflatehd_SOURCES_DIST = deflatehd.cc comp_helper. + @ENABLE_HPACK_TOOLS_TRUE@ $(am__objects_4) + deflatehd_OBJECTS = $(am_deflatehd_OBJECTS) + deflatehd_LDADD = $(LDADD) +-deflatehd_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \ ++deflatehd_DEPENDENCIES = -lnghttp2 \ + $(top_builddir)/third-party/liburl-parser.la \ + $(top_builddir)/third-party/libllhttp.la + am__h2load_SOURCES_DIST = util.cc util.h http2.cc http2.h h2load.cc \ +@@ -411,7 +411,7 @@ am__h2load_SOURCES_DIST = util.cc util.h http2.cc http + @ENABLE_APP_TRUE@ $(am__objects_5) + h2load_OBJECTS = $(am_h2load_OBJECTS) + h2load_LDADD = $(LDADD) +-h2load_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \ ++h2load_DEPENDENCIES = -lnghttp2 \ + $(top_builddir)/third-party/liburl-parser.la \ + $(top_builddir)/third-party/libllhttp.la + am__inflatehd_SOURCES_DIST = inflatehd.cc comp_helper.c comp_helper.h +@@ -419,7 +419,7 @@ am__inflatehd_SOURCES_DIST = inflatehd.cc comp_helper. + @ENABLE_HPACK_TOOLS_TRUE@ $(am__objects_4) + inflatehd_OBJECTS = $(am_inflatehd_OBJECTS) + inflatehd_LDADD = $(LDADD) +-inflatehd_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \ ++inflatehd_DEPENDENCIES = -lnghttp2 \ + $(top_builddir)/third-party/liburl-parser.la \ + $(top_builddir)/third-party/libllhttp.la + am__nghttp_SOURCES_DIST = util.cc http2.cc timegm.c app_helper.cc \ +@@ -438,7 +438,7 @@ am__objects_7 = + @ENABLE_APP_TRUE@ $(am__objects_7) tls.$(OBJEXT) + nghttp_OBJECTS = $(am_nghttp_OBJECTS) + nghttp_LDADD = $(LDADD) +-nghttp_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \ ++nghttp_DEPENDENCIES = -lnghttp2 \ + $(top_builddir)/third-party/liburl-parser.la \ + $(top_builddir)/third-party/libllhttp.la + am__nghttpd_SOURCES_DIST = util.cc http2.cc timegm.c app_helper.cc \ +@@ -450,13 +450,13 @@ am__nghttpd_SOURCES_DIST = util.cc http2.cc timegm.c a + @ENABLE_APP_TRUE@ tls.$(OBJEXT) HttpServer.$(OBJEXT) + nghttpd_OBJECTS = $(am_nghttpd_OBJECTS) + nghttpd_LDADD = $(LDADD) +-nghttpd_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \ ++nghttpd_DEPENDENCIES = -lnghttp2 \ + $(top_builddir)/third-party/liburl-parser.la \ + $(top_builddir)/third-party/libllhttp.la + am__nghttpx_SOURCES_DIST = shrpx.cc shrpx.h + @ENABLE_APP_TRUE@am_nghttpx_OBJECTS = nghttpx-shrpx.$(OBJEXT) + nghttpx_OBJECTS = $(am_nghttpx_OBJECTS) +-am__DEPENDENCIES_2 = $(top_builddir)/lib/libnghttp2.la \ ++am__DEPENDENCIES_2 = -lnghttp2 \ + $(top_builddir)/third-party/liburl-parser.la \ + $(top_builddir)/third-party/libllhttp.la + @ENABLE_APP_TRUE@nghttpx_DEPENDENCIES = libnghttpx.a \ +@@ -1146,7 +1146,7 @@ AM_CPPFLAGS = \ + @DEFS@ + + AM_LDFLAGS = @LIBTOOL_LDFLAGS@ +-LDADD = $(top_builddir)/lib/libnghttp2.la \ ++LDADD = -lnghttp2 \ + $(top_builddir)/third-party/liburl-parser.la \ + $(top_builddir)/third-party/libllhttp.la \ + @JEMALLOC_LIBS@ \ +@@ -1322,7 +1322,7 @@ LDADD = $(top_builddir)/lib/libnghttp2.la \ + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_CPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS} + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 1:0:0 + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_LIBADD = \ +-@ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/lib/libnghttp2.la \ ++@ENABLE_ASIO_LIB_TRUE@ -lnghttp2 \ + @ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/third-party/liburl-parser.la \ + @ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/third-party/libllhttp.la \ + @ENABLE_ASIO_LIB_TRUE@ @OPENSSL_LIBS@ \ diff --git a/www/nghttp2/files/patch-tests-Makefile.in b/www/nghttp2/files/patch-tests-Makefile.in new file mode 100644 index 000000000000..f521a8965870 --- /dev/null +++ b/www/nghttp2/files/patch-tests-Makefile.in @@ -0,0 +1,31 @@ +sed -i .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' */Makefile.in + +--- tests/Makefile.in.orig 2021-10-19 09:32:30 UTC ++++ tests/Makefile.in +@@ -141,7 +141,7 @@ failmalloc_OBJECTS = $(am_failmalloc_OBJECTS) + am__DEPENDENCIES_1 = + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 = ${top_builddir}/lib/.libs/*.o \ + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@ $(am__DEPENDENCIES_1) +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 = ${top_builddir}/lib/libnghttp2.la \ ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 = -lnghttp2 \ + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@ $(am__DEPENDENCIES_1) + @ENABLE_FAILMALLOC_TRUE@@HAVE_CUNIT_TRUE@failmalloc_DEPENDENCIES = $(am__DEPENDENCIES_2) + AM_V_lt = $(am__v_lt_@AM_V@) +@@ -177,7 +177,7 @@ am__objects_1 = + main_OBJECTS = $(am_main_OBJECTS) + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@main_DEPENDENCIES = ${top_builddir}/lib/.libs/*.o \ + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@ $(am__DEPENDENCIES_1) +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_DEPENDENCIES = ${top_builddir}/lib/libnghttp2.la \ ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_DEPENDENCIES = -lnghttp2 \ + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@ $(am__DEPENDENCIES_1) + main_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +@@ -732,7 +732,7 @@ EXTRA_DIST = CMakeLists.txt + # files directly because the tests use symbols not included in public API. + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@main_LDADD = ${top_builddir}/lib/.libs/*.o \ + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@ $(am__append_2) +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_LDADD = ${top_builddir}/lib/libnghttp2.la \ ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_LDADD = -lnghttp2 \ + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@ $(am__append_2) + @HAVE_CUNIT_TRUE@main_LDFLAGS = -static + @ENABLE_FAILMALLOC_TRUE@@HAVE_CUNIT_TRUE@failmalloc_SOURCES = failmalloc.c failmalloc_test.c failmalloc_test.h \