Prior to the refactoring of the autotools setup we used different python
detection mechanisms for the python agent feature and the example code.
The example code detection was flawed as it would only work with a
python binary named exactly 'python'. Wire the detected python binary in
the examples Makefile integration.
Change-Id: I07b9222a8869ff154073e5b72fb2ac0d70f14896
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
$(MAKE) all \
AR="$(AR)" \
CC="$(CC)" \
$(MAKE) all \
AR="$(AR)" \
CC="$(CC)" \
CPPFLAGS="$(CPPFLAGS)" \
AM_CPPFLAGS="$(AM_CPPFLAGS) \
-I$$rel_src_subdir$(top_srcdir)/include/ \
CPPFLAGS="$(CPPFLAGS)" \
AM_CPPFLAGS="$(AM_CPPFLAGS) \
-I$$rel_src_subdir$(top_srcdir)/include/ \
#
# This makefile is purposefully kept simple to support GNU and BSD make.
#
# This makefile is purposefully kept simple to support GNU and BSD make.
LIBS = -ldl -llttng-ust #On Linux
#LIBS = -lc -llttng-ust #On BSD
AM_V_P := :
LIBS = -ldl -llttng-ust #On Linux
#LIBS = -lc -llttng-ust #On BSD
AM_V_P := :
CFLAGS="$(AM_CFLAGS) $(CFLAGS)" \
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \
CC="$(CC)" \
CFLAGS="$(AM_CFLAGS) $(CFLAGS)" \
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \
CC="$(CC)" \
- $(LTTNG_GEN_TP_PATH)lttng-gen-tp -o $@ $<
+ $(PYTHON) $(LTTNG_GEN_TP_PATH)lttng-gen-tp -o $@ $<
# The following rule can be used to generate all files instead of having one
# for each file type. Note that the sample.o has a dependency on the
# The following rule can be used to generate all files instead of having one
# for each file type. Note that the sample.o has a dependency on the
%.h: %.tp
@if $(AM_V_P); then set -x; else echo " GEN $@"; fi; \
%.h: %.tp
@if $(AM_V_P); then set -x; else echo " GEN $@"; fi; \
- $(LTTNG_GEN_TP_PATH)lttng-gen-tp -o $@ $<
+ $(PYTHON) $(LTTNG_GEN_TP_PATH)lttng-gen-tp -o $@ $<
%.c: %.tp
@if $(AM_V_P); then set -x; else echo " GEN $@"; fi; \
%.c: %.tp
@if $(AM_V_P); then set -x; else echo " GEN $@"; fi; \
- $(LTTNG_GEN_TP_PATH)lttng-gen-tp -o $@ $<
+ $(PYTHON) $(LTTNG_GEN_TP_PATH)lttng-gen-tp -o $@ $<