diff options
| author | Colin Walters <walters@verbum.org> | 2009-02-17 13:00:58 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-02-17 13:00:58 -0500 |
| commit | ca778d512f3605b2e177012e26d50720c0a110c5 (patch) | |
| tree | 93013fc6e4c5cf61bb927d0eeff1392733e62013 /tests/scanner | |
| parent | c163cf24782b41ec118008be2b40684a69b5c969 (diff) | |
| parent | c577448bbdb7711a4e38fea5325e80b4b7dea058 (diff) | |
| download | gobject-introspection-ca778d512f3605b2e177012e26d50720c0a110c5.tar.gz | |
Merge branch 'master' of ssh://walters@git.gnome.org/git/gobject-introspection
Diffstat (limited to 'tests/scanner')
| -rw-r--r-- | tests/scanner/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index dd353290..d8c96fa0 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -109,7 +109,7 @@ barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h barapp_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la barapp_LDFLAGS = -export-dynamic BarApp-1.0.gir: barapp $(SCANNER_BIN) $(SCANNER_LIBS) Makefile - $(SCANNER) \ +LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(SCANNER) \ --include=GObject-2.0 \ --libtool="$(LIBTOOL)" \ --program=./barapp \ @@ -143,10 +143,10 @@ post-check: @true %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) Makefile - $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ %.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile - $(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ %.tgir.check: %.tgir @diff -u -U 10 $(srcdir)/$*-expected.tgir $*.tgir; \ |