* Re: [PATCH urcu v3] Fix: Don't override user variables within the build system
[not found] <1493761245-1251-1-git-send-email-mjeanson@efficios.com>
@ 2017-05-02 21:43 ` Michael Jeanson
2017-05-08 17:56 ` Mathieu Desnoyers
1 sibling, 0 replies; 3+ messages in thread
From: Michael Jeanson @ 2017-05-02 21:43 UTC (permalink / raw)
To: lttng-dev, mathieu.desnoyers
On 2017-05-02 17:40, Michael Jeanson wrote:
> Instead use the appropriatly prefixed AM_* variables as to not interfere
> when a user variable is passed to a make command. The proper use of flag
> variables is documented at :
>
> https://www.gnu.org/software/automake/manual/automake.html#Flag-Variables-Ordering
>
> Fixes #1095
>
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
> configure.ac | 11 +++++------
> doc/examples/Makefile.am | 2 +-
> doc/examples/Makefile.examples.template | 9 +++------
> src/Makefile.am | 8 ++++----
> tests/benchmark/Makefile.am | 2 +-
> tests/common/Makefile.am | 2 +-
> tests/regression/Makefile.am | 2 +-
> tests/unit/Makefile.am | 2 +-
> tests/utils/Makefile.am | 2 +-
> 9 files changed, 18 insertions(+), 22 deletions(-)
This patch deprecates :
[PATCH urcu v2] Fix: Don't use CFLAGS in configure script
It now has a broader scope than just CFLAGS.
Michael
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH urcu v3] Fix: Don't override user variables within the build system
[not found] <1493761245-1251-1-git-send-email-mjeanson@efficios.com>
2017-05-02 21:43 ` [PATCH urcu v3] Fix: Don't override user variables within the build system Michael Jeanson
@ 2017-05-08 17:56 ` Mathieu Desnoyers
1 sibling, 0 replies; 3+ messages in thread
From: Mathieu Desnoyers @ 2017-05-08 17:56 UTC (permalink / raw)
To: Michael Jeanson; +Cc: lttng-dev
Merged into master. Can you provide a patch for stable-0.9 and 0.8 as
well ? The cherry-pick is not straightforward.
Thanks,
Mathieu
----- On May 2, 2017, at 5:40 PM, Michael Jeanson mjeanson@efficios.com wrote:
> Instead use the appropriatly prefixed AM_* variables as to not interfere
> when a user variable is passed to a make command. The proper use of flag
> variables is documented at :
>
> https://www.gnu.org/software/automake/manual/automake.html#Flag-Variables-Ordering
>
> Fixes #1095
>
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
> configure.ac | 11 +++++------
> doc/examples/Makefile.am | 2 +-
> doc/examples/Makefile.examples.template | 9 +++------
> src/Makefile.am | 8 ++++----
> tests/benchmark/Makefile.am | 2 +-
> tests/common/Makefile.am | 2 +-
> tests/regression/Makefile.am | 2 +-
> tests/unit/Makefile.am | 2 +-
> tests/utils/Makefile.am | 2 +-
> 9 files changed, 18 insertions(+), 22 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index ba7538d..5aa3433 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -89,9 +89,6 @@ AS_IF([test "x$ax_cv___attribute__" = "xyes"],
> [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
>
> AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
> -LIBS="$PTHREAD_LIBS $LIBS"
> -CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
> -CC="$PTHREAD_CC"
>
> # Checks for library functions.
> AC_FUNC_MMAP
> @@ -168,7 +165,7 @@ AS_IF([test "x$SUBARCHTYPE" = xx86compat],[
> ])
>
> AS_IF([test "$host_cpu" = "armv7l"],[
> - CFLAGS="$CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
> + AM_CFLAGS="$AM_CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
> ])
>
> # ARM-specific checks
> @@ -367,8 +364,10 @@ AC_CHECK_FUNCS([sched_setaffinity],[
> ])
> ])
>
> -DEFAULT_INCLUDES="-include config.h"
> -AC_SUBST(DEFAULT_INCLUDES)
> +AM_CPPFLAGS="-include config.h"
> +AC_SUBST(AM_CPPFLAGS)
> +
> +AC_SUBST(AM_CFLAGS)
>
> AC_CONFIG_LINKS([
> include/urcu/arch.h:$ARCHSRC
> diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
> index 88f8968..734582a 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 AM_CC="$(CC)" AM_CPPFLAGS="$(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/" AM_CFLAGS='$(CFLAGS)'
> AM_LDFLAGS='$(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) $(PTHREAD_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/doc/examples/Makefile.examples.template
> b/doc/examples/Makefile.examples.template
> index 6dd2bac..4b2378e 100644
> --- a/doc/examples/Makefile.examples.template
> +++ b/doc/examples/Makefile.examples.template
> @@ -11,19 +11,16 @@
> #
> # This makefile is purposefully kept simple to support GNU and BSD make.
>
> -ifdef AM_CC
> -CC = $(AM_CC)
> -endif
> -CFLAGS = -g -O2 -Wall
> +LOCAL_CFLAGS := -g -O2 -Wall
>
> all: $(BINARY)
>
> $(BINARY): $(OBJECTS)
> - $(CC) $(CFLAGS) $(LDFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
> + $(CC) $(LOCAL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
> -o $@ $(OBJECTS) $(LIBS)
>
> $(OBJECTS): $(SOURCES) $(DEPS)
> - $(CC) $(CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS) $(AM_CFLAGS) \
> + $(CC) $(LOCAL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) \
> -c -o $@ $(SOURCES)
>
> .PHONY: clean
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 6a2fd7a..776c2a3 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -1,4 +1,4 @@
> -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
> -I$(top_srcdir)/src
> +AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include
> -I$(top_srcdir)/src
>
> #Add the -version-info directly here since we are only building
> # library that use the version-info
> @@ -6,7 +6,7 @@ AM_LDFLAGS=-version-info $(URCU_LIBRARY_VERSION)
> if USE_CYGWIN
> AM_LDFLAGS+=-no-undefined
> endif
> -AM_CFLAGS=-Wall
> +AM_CFLAGS+=-Wall
>
> include_HEADERS = urcu.h urcu-bp.h urcu-call-rcu.h urcu-defer.h \
> urcu-pointer.h urcu-qsbr.h urcu-flavor.h
> @@ -44,11 +44,11 @@ liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c
> $(COMPAT)
> liburcu_qsbr_la_LIBADD = liburcu-common.la
>
> liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
> -liburcu_mb_la_CFLAGS = -DRCU_MB
> +liburcu_mb_la_CFLAGS = -DRCU_MB $(AM_CFLAGS)
> liburcu_mb_la_LIBADD = liburcu-common.la
>
> liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
> -liburcu_signal_la_CFLAGS = -DRCU_SIGNAL
> +liburcu_signal_la_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
> liburcu_signal_la_LIBADD = liburcu-common.la
>
> liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
> diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am
> index 0c3fd77..9899f54 100644
> --- a/tests/benchmark/Makefile.am
> +++ b/tests/benchmark/Makefile.am
> @@ -1,4 +1,4 @@
> -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
> -I$(top_srcdir)/src -I$(top_srcdir)/tests/common -g
> +AM_CFLAGS += $(PTHREAD_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/common/Makefile.am b/tests/common/Makefile.am
> index d919ca1..5935098 100644
> --- a/tests/common/Makefile.am
> +++ b/tests/common/Makefile.am
> @@ -1,4 +1,4 @@
> -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
> -I$(top_srcdir)/src
> +AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include
> -I$(top_srcdir)/src
>
> noinst_HEADERS = cpuset.h thread-id.h
>
> diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
> index aa7a00c..328dcf4 100644
> --- a/tests/regression/Makefile.am
> +++ b/tests/regression/Makefile.am
> @@ -1,4 +1,4 @@
> -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
> +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
>
> SCRIPT_LIST = run.sh
>
> diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
> index 54eb9f3..ce9d1b2 100644
> --- a/tests/unit/Makefile.am
> +++ b/tests/unit/Makefile.am
> @@ -1,4 +1,4 @@
> -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
> +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
>
> SCRIPT_LIST = test_loop run.sh unit_tests
>
> diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am
> index 440ac38..31d7913 100644
> --- a/tests/utils/Makefile.am
> +++ b/tests/utils/Makefile.am
> @@ -1,4 +1,4 @@
> -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
> -I$(top_srcdir)/src
> +AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include
> -I$(top_srcdir)/src
>
> noinst_LIBRARIES = libtap.a
> libtap_a_SOURCES = tap.c tap.h
> --
> 2.7.4
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH urcu v3] Fix: Don't override user variables within the build system
@ 2017-05-02 21:40 Michael Jeanson
0 siblings, 0 replies; 3+ messages in thread
From: Michael Jeanson @ 2017-05-02 21:40 UTC (permalink / raw)
To: lttng-dev, mathieu.desnoyers
Instead use the appropriatly prefixed AM_* variables as to not interfere
when a user variable is passed to a make command. The proper use of flag
variables is documented at :
https://www.gnu.org/software/automake/manual/automake.html#Flag-Variables-Ordering
Fixes #1095
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
configure.ac | 11 +++++------
doc/examples/Makefile.am | 2 +-
doc/examples/Makefile.examples.template | 9 +++------
src/Makefile.am | 8 ++++----
tests/benchmark/Makefile.am | 2 +-
tests/common/Makefile.am | 2 +-
tests/regression/Makefile.am | 2 +-
tests/unit/Makefile.am | 2 +-
tests/utils/Makefile.am | 2 +-
9 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/configure.ac b/configure.ac
index ba7538d..5aa3433 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,9 +89,6 @@ AS_IF([test "x$ax_cv___attribute__" = "xyes"],
[AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
# Checks for library functions.
AC_FUNC_MMAP
@@ -168,7 +165,7 @@ AS_IF([test "x$SUBARCHTYPE" = xx86compat],[
])
AS_IF([test "$host_cpu" = "armv7l"],[
- CFLAGS="$CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
+ AM_CFLAGS="$AM_CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
])
# ARM-specific checks
@@ -367,8 +364,10 @@ AC_CHECK_FUNCS([sched_setaffinity],[
])
])
-DEFAULT_INCLUDES="-include config.h"
-AC_SUBST(DEFAULT_INCLUDES)
+AM_CPPFLAGS="-include config.h"
+AC_SUBST(AM_CPPFLAGS)
+
+AC_SUBST(AM_CFLAGS)
AC_CONFIG_LINKS([
include/urcu/arch.h:$ARCHSRC
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 88f8968..734582a 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 AM_CC="$(CC)" AM_CPPFLAGS="$(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/" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(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) $(PTHREAD_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/doc/examples/Makefile.examples.template b/doc/examples/Makefile.examples.template
index 6dd2bac..4b2378e 100644
--- a/doc/examples/Makefile.examples.template
+++ b/doc/examples/Makefile.examples.template
@@ -11,19 +11,16 @@
#
# This makefile is purposefully kept simple to support GNU and BSD make.
-ifdef AM_CC
-CC = $(AM_CC)
-endif
-CFLAGS = -g -O2 -Wall
+LOCAL_CFLAGS := -g -O2 -Wall
all: $(BINARY)
$(BINARY): $(OBJECTS)
- $(CC) $(CFLAGS) $(LDFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
+ $(CC) $(LOCAL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@ $(OBJECTS) $(LIBS)
$(OBJECTS): $(SOURCES) $(DEPS)
- $(CC) $(CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS) $(AM_CFLAGS) \
+ $(CC) $(LOCAL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) \
-c -o $@ $(SOURCES)
.PHONY: clean
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a2fd7a..776c2a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src
+AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src
#Add the -version-info directly here since we are only building
# library that use the version-info
@@ -6,7 +6,7 @@ AM_LDFLAGS=-version-info $(URCU_LIBRARY_VERSION)
if USE_CYGWIN
AM_LDFLAGS+=-no-undefined
endif
-AM_CFLAGS=-Wall
+AM_CFLAGS+=-Wall
include_HEADERS = urcu.h urcu-bp.h urcu-call-rcu.h urcu-defer.h \
urcu-pointer.h urcu-qsbr.h urcu-flavor.h
@@ -44,11 +44,11 @@ liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c $(COMPAT)
liburcu_qsbr_la_LIBADD = liburcu-common.la
liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_mb_la_CFLAGS = -DRCU_MB
+liburcu_mb_la_CFLAGS = -DRCU_MB $(AM_CFLAGS)
liburcu_mb_la_LIBADD = liburcu-common.la
liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_signal_la_CFLAGS = -DRCU_SIGNAL
+liburcu_signal_la_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
liburcu_signal_la_LIBADD = liburcu-common.la
liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am
index 0c3fd77..9899f54 100644
--- a/tests/benchmark/Makefile.am
+++ b/tests/benchmark/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/common -g
+AM_CFLAGS += $(PTHREAD_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/common/Makefile.am b/tests/common/Makefile.am
index d919ca1..5935098 100644
--- a/tests/common/Makefile.am
+++ b/tests/common/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src
+AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src
noinst_HEADERS = cpuset.h thread-id.h
diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index aa7a00c..328dcf4 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,4 +1,4 @@
-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
+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
SCRIPT_LIST = run.sh
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 54eb9f3..ce9d1b2 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,4 +1,4 @@
-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
+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
SCRIPT_LIST = test_loop run.sh unit_tests
diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am
index 440ac38..31d7913 100644
--- a/tests/utils/Makefile.am
+++ b/tests/utils/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src
+AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src
noinst_LIBRARIES = libtap.a
libtap_a_SOURCES = tap.c tap.h
--
2.7.4
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-08 17:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1493761245-1251-1-git-send-email-mjeanson@efficios.com>
2017-05-02 21:43 ` [PATCH urcu v3] Fix: Don't override user variables within the build system Michael Jeanson
2017-05-08 17:56 ` Mathieu Desnoyers
2017-05-02 21:40 Michael Jeanson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.