diff options
| author | Johan Dahlin <johan@gnome.org> | 2010-12-02 20:56:41 -0200 |
|---|---|---|
| committer | Johan Dahlin <jdahlin@litl.com> | 2010-12-02 20:57:00 -0200 |
| commit | ed52398ca5bdd9dbb707a8c6b9f2ef9eb513b8dd (patch) | |
| tree | 119508fdc3df52d2dcead8404e6e6e62ec2a7167 | |
| parent | 7222ad74d05fa226de5f236539a67e366a66ad56 (diff) | |
| download | gjs-ed52398ca5bdd9dbb707a8c6b9f2ef9eb513b8dd.tar.gz | |
Send LD_LIBRARY_PATH to the scanner, avoids a build error on Ubuntu Lucid
| -rw-r--r-- | Makefile-test.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile-test.am b/Makefile-test.am index 1e05841f..85eed134 100644 --- a/Makefile-test.am +++ b/Makefile-test.am @@ -77,7 +77,7 @@ libgimarshallingtests_la_LDFLAGS = -avoid-version $(GJS_LIBS) # g-i doesn't ship these as shared libraries anymore; we build them here Regress-1.0.gir: libregress.la Makefile - $(AM_V_GEN) g-ir-scanner --include=cairo-1.0 --include=Gio-2.0 \ + $(AM_V_GEN) LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(FIREFOX_JS_LIBDIR)" g-ir-scanner --include=cairo-1.0 --include=Gio-2.0 \ --namespace=Regress --nsversion=1.0 \ --warn-all --warn-error \ --library=libregress.la \ @@ -90,7 +90,7 @@ Regress-1.0.typelib: Regress-1.0.gir Makefile CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile - $(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \ + $(AM_V_GEN) LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(FIREFOX_JS_LIBDIR)" g-ir-scanner --include=Gio-2.0 \ --namespace=GIMarshallingTests --nsversion=1.0 --symbol-prefix=gi_marshalling_tests \ --warn-all --warn-error \ --library=libgimarshallingtests.la \ |