Upgrade to 1.46.0

[platform/upstream/nghttp2.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 2fd6ead..7d9fec5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ bin_PROGRAMS =
 check_PROGRAMS =
 TESTS =
 
-AM_CFLAGS = $(WARNCFLAGS)
+AM_CFLAGS = $(WARNCFLAGS) -fPIE
 AM_CXXFLAGS = $(WARNCXXFLAGS) $(CXX1XCXXFLAGS)
 AM_CPPFLAGS = \
        -DPKGDATADIR='"$(pkgdatadir)"' \
@@ -55,7 +55,8 @@ AM_CPPFLAGS = \
        @LIBBPF_CFLAGS@ \
        @ZLIB_CFLAGS@ \
        @EXTRA_DEFS@ \
-       @DEFS@
+       @DEFS@ \
+       -fPIE
 AM_LDFLAGS = @LIBTOOL_LDFLAGS@
 
 LDADD = $(top_builddir)/lib/libnghttp2.la \
@@ -192,6 +193,7 @@ libnghttpx_a_CPPFLAGS = ${AM_CPPFLAGS}
 nghttpx_SOURCES = shrpx.cc shrpx.h
 nghttpx_CPPFLAGS = ${libnghttpx_a_CPPFLAGS}
 nghttpx_LDADD = libnghttpx.a ${LDADD}
+nghttpx_LDFLAGS = -pie
 
 if HAVE_MRUBY
 libnghttpx_a_CPPFLAGS += \
@@ -293,8 +295,9 @@ libnghttp2_asio_la_SOURCES = \
        asio_client_stream.cc asio_client_stream.h \
        asio_client_tls_context.cc asio_client_tls_context.h
 
-libnghttp2_asio_la_CPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS}
-libnghttp2_asio_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 1:0:0
+
+libnghttp2_asio_la_CPPFLAGS = ${AM_CPPFLAGS} ${BOOST_CPPFLAGS} -fPIE
+libnghttp2_asio_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 1:0:0 -pie
 libnghttp2_asio_la_LIBADD = \
        $(top_builddir)/lib/libnghttp2.la \
        $(top_builddir)/third-party/liburl-parser.la \