From b1200a87bc0bd4f4fcd5275f25422032104138ed Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 4 May 2017 23:06:51 +0100 Subject: build: Use $(srcdir) when calling Python scripts We need to point Python in the right direction, because unlike source rules, automake won't automatically expand commands in explicit make rules. --- tests/offsets/Makefile.am | 2 +- tests/scanner/Makefile.am | 2 +- tests/warn/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am index 0130ee52..d17f4914 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -39,7 +39,7 @@ gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_s gitestoffsets_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) gitestoffsets.c: gen-gitestoffsets offsets.h Offsets-1.0.typelib - $(AM_V_GEN) $(PYTHON) gen-gitestoffsets offsets.h > $@ || ( rm -f $@ && false ) + $(AM_V_GEN) $(PYTHON) $(srcdir)/gen-gitestoffsets offsets.h > $@ || ( rm -f $@ && false ) EXTRA_DIST += gen-gitestoffsets BUILT_SOURCES += gitestoffsets.c diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 6d5e0cf9..6b705f5d 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -184,7 +184,7 @@ CHECKGIRS += Identfilter-1.0.gir Identfilter-1.0.gir: identfilter.h $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) \ --namespace=Identfilter --accept-unprefixed --nsversion=1.0 --header-only \ - --identifier-filter-cmd="$(PYTHON) identfilter.py" \ + --identifier-filter-cmd="$(PYTHON) $(srcdir)/identfilter.py" \ --output=$@ $< EXTRA_DIST += \ diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am index f6307845..5f47df0a 100644 --- a/tests/warn/Makefile.am +++ b/tests/warn/Makefile.am @@ -22,6 +22,6 @@ TESTS = \ unresolved-type.h LOG_COMPILER = env PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ - $(PYTHON) warningtester.py + $(PYTHON) $(srcdir)/warningtester.py EXTRA_DIST = warningtester.py common.h $(TESTS) -- cgit v1.2.1