From fed2db62a1ff24a30d364b5a528221e3bdb5f6ab Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 8 May 2017 16:03:21 -0400 Subject: [PATCH] Fix: remove double use of PTHREAD_CFLAGS Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- doc/examples/Makefile.am | 2 +- tests/benchmark/Makefile.am | 2 +- tests/regression/Makefile.am | 2 +- tests/unit/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 734582a..156dc85 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -145,7 +145,7 @@ all-local: echo "Examples: relative top_builddir path $(top_builddir)"; \ rel_build_subdir="../"; \ fi; \ - $(MAKE) -f dist-files/Makefile CC="$(CC)" CPPFLAGS="$(CPPLAGS)" AM_CPPFLAGS="$(AM_CPPFLAGS) -I"$${rel_src_subdir}/$(top_srcdir)/include/" -I"$${rel_src_subdir}/$(top_srcdir)/src/" -I"$${rel_build_subdir}$(top_builddir)/include/" -I"$${rel_build_subdir}$(top_builddir)/include/src/"" CFLAGS="$(CFLAGS)" AM_CFLAGS="$(AM_CFLAGS) $(PTHREAD_CFLAGS)" LDFLAGS="$(LDFLAGS)" AM_LDFLAGS="$(AM_LDFLAGS) -L../../../src/.libs/ -Wl,-rpath "$(PWD)/../../src/.libs/"" $(AM_MAKEFLAGS) all; + $(MAKE) -f dist-files/Makefile CC="$(CC)" CPPFLAGS="$(CPPLAGS)" AM_CPPFLAGS="$(AM_CPPFLAGS) -I"$${rel_src_subdir}/$(top_srcdir)/include/" -I"$${rel_src_subdir}/$(top_srcdir)/src/" -I"$${rel_build_subdir}$(top_builddir)/include/" -I"$${rel_build_subdir}$(top_builddir)/include/src/"" CFLAGS="$(CFLAGS)" AM_CFLAGS="$(AM_CFLAGS)" LDFLAGS="$(LDFLAGS)" AM_LDFLAGS="$(AM_LDFLAGS) -L../../../src/.libs/ -Wl,-rpath "$(PWD)/../../src/.libs/"" $(AM_MAKEFLAGS) all; clean-local: @$(MAKE) -f dist-files/Makefile $(AM_MAKEFLAGS) clean; \ diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am index 9899f54..216d013 100644 --- a/tests/benchmark/Makefile.am +++ b/tests/benchmark/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS += $(PTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/common -g +AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/common -g SCRIPT_LIST = common.sh \ run.sh \ diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am index 328dcf4..c7d102f 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS += $(PTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g +AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g SCRIPT_LIST = run.sh diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index ce9d1b2..e6f7b3e 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS += $(PTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g +AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g SCRIPT_LIST = test_loop run.sh unit_tests -- 2.34.1