diff options
| author | Colin Walters <walters@verbum.org> | 2009-08-16 23:43:37 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-08-16 23:43:37 -0400 |
| commit | b2d26635b316549c4e95f777961b68ea59372f91 (patch) | |
| tree | 2477aceee2ba5c9e5457ebf235f4d864d6c10dc8 | |
| parent | c35c88f77c996b99827c3ef4e9ac69fe379629b4 (diff) | |
| download | gobject-introspection-b2d26635b316549c4e95f777961b68ea59372f91.tar.gz | |
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).
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | gir/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 a82cd991..caffabda 100644 --- 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 \ |