On Tue, Apr 30, 2019 at 11:37:41AM -0300, Marcelo Ricardo Leitner wrote:
> After 9607dd85e70a ("netinet/sctp.h: dynamically build based on system
> setup") the header file is generated on the builddir and won't be
> located in the srcdir anymore. This broke builds using different dirs
> for building other than the src dir.
>
> Fix it by telling automake to use the include dir based on top_builddir
> instead.
>
> Fixes #30
>
> Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup")
> Reported-by: Alexander Gallego
> Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@xxxxxxxxx>
> ---
> src/apps/Makefile.am | 2 +-
> src/func_tests/Makefile.am | 2 +-
> src/lib/Makefile.am | 2 +-
> src/testlib/Makefile.am | 2 +-
> src/withsctp/Makefile.am | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am
> index 7e33b9c87f003cadcd1f674012b0eb4147c55c71..7e32306a61b985bf9efbe088a30bef9e2154e1d4 100644
> --- a/src/apps/Makefile.am
> +++ b/src/apps/Makefile.am
> @@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.rules
> include $(top_srcdir)/Makefile.dirs
>
> # General compilation flags
> -AM_CPPFLAGS = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib \
> +AM_CPPFLAGS = -I. -I$(top_builddir)/src/include -I$(top_srcdir)/src/testlib \
> -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes \
> -Wimplicit-function-declaration
>
> diff --git a/src/func_tests/Makefile.am b/src/func_tests/Makefile.am
> index 495adcf352caf2aa446b4dec599a289a6bb05205..e5bf454cde73bd7944e5543c90251fdbb6eb8271 100644
> --- a/src/func_tests/Makefile.am
> +++ b/src/func_tests/Makefile.am
> @@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.rules
> include $(top_srcdir)/Makefile.dirs
>
> # General compilation flags
> -AM_CPPFLAGS = -I. -I$(top_srcdir)/src/include -I$(top_srcdir)/src/testlib \
> +AM_CPPFLAGS = -I. -I$(top_builddir)/src/include -I$(top_srcdir)/src/testlib \
> -g -O2 -fno-strict-aliasing -Wall -Wstrict-prototypes \
> -Wimplicit-function-declaration
>
> diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
> index 1d62175c71b7e9b7b59d987c5781902d5f96d9db..1296caae653b60bc53d7aaa3d2eefbb78f9ff63a 100644
> --- a/src/lib/Makefile.am
> +++ b/src/lib/Makefile.am
> @@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.rules
> include $(top_srcdir)/Makefile.dirs
>
> # General compilation flags
> -AM_CPPFLAGS = -I$(top_srcdir)/src/include
> +AM_CPPFLAGS = -I$(top_builddir)/src/include
>
> lib_LTLIBRARIES = libsctp.la
>
> diff --git a/src/testlib/Makefile.am b/src/testlib/Makefile.am
> index fae6bbcef610874d5e64951ca21e6df160112cca..b94961109591c097ab9f7b9c1aa34bce89e5a430 100644
> --- a/src/testlib/Makefile.am
> +++ b/src/testlib/Makefile.am
> @@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.rules
> include $(top_srcdir)/Makefile.dirs
>
> # General compilation flags
> -AM_CPPFLAGS = -I$(top_srcdir)/src/include
> +AM_CPPFLAGS = -I$(top_builddir)/src/include
>
> noinst_LTLIBRARIES = libsctputil.la
> libsctputil_la_SOURCES = sctputil.c sctputil.h
> diff --git a/src/withsctp/Makefile.am b/src/withsctp/Makefile.am
> index 1f6ca37062d6c85ad6f127d72f23514109c92d9c..31575886d703584d79a889eba104f36295a3f708 100644
> --- a/src/withsctp/Makefile.am
> +++ b/src/withsctp/Makefile.am
> @@ -10,7 +10,7 @@ include $(top_srcdir)/Makefile.rules
> bin_PROGRAMS = checksctp
> bin_SCRIPTS = withsctp
>
> -AM_CPPFLAGS=-I$(top_srcdir)/src/include
> +AM_CPPFLAGS=-I$(top_builddir)/src/include
> pkglib_LTLIBRARIES = libwithsctp.la
> libwithsctp_la_SOURCES = sctp_load_libs.c sctp_socket.c sctp_bind.c \
> sctp_sockopt.c sctp_socket.h
> --
> 2.20.1
>
>
Acked-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
