Move LPATH and $(CHECK_DEBUG) bits into $(SCANNER)

This allows us to consistently use $(SCANNER) as the first item
which needs to work for $(AM_V_GEN).

diff --git a/common.mk b/common.mk
index 6068e9c..de8333e 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -4,7 +4,7 @@ SCANNER_ENV = env PYTHONPATH=$(SCANNER_PYTHONPATH) \
        UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
        UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
 SCANNER_ARGS = -v --add-include-path=$(top_builddir)/gir --add-include-path=.
-SCANNER = $(AM_V_GEN) $(SCANNER_ENV) $(SCANNER_BIN) $(SCANNER_ARGS)
+SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) $(SCANNER_BIN) $(SCANNER_ARGS)
 SCANNER_LIBS = \
        $(top_srcdir)/giscanner/*.py \
        $(top_builddir)/giscanner/libgiscanner.la \

diff --git a/gir/Makefile.am b/gir/Makefile.am
index a82cd99..caffabd 100644 (file)
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -184,7 +184,7 @@ libgirepository_everything_1_0_la_LDFLAGS += -no-undefined
 endif
 
 Everything-$(TYPELIB_VERSION).gir: libgirepository-everything-1.0.la everything.c everything.h $(SCANNER_BIN) $(SCANNER_LIBS)
-       LPATH=$(builddir)/.libs $(CHECK_DEBUG) $(SCANNER) \
+       $(SCANNER) \
        --include=GObject-2.0 \
        --libtool="$(LIBTOOL)" \
        --library=girepository-everything-1.0 \