diff options
| author | Johan Dahlin <jdahlin@litl.com> | 2009-02-17 14:15:52 (GMT) |
|---|---|---|
| committer | Johan Dahlin <johan@gnome.org> | 2009-02-17 14:19:58 (GMT) |
| commit | 09a698b389b5335fa3232ff2099b8880f14b7176 (patch) | |
| tree | d45fc6c55b43243e594a172eb45c937937669cd6 | |
| parent | 2c11326adf09324a9e072459b835cd59724b4a86 (diff) | |
Set LD_LIBRARY_PATH for girepository-1.0
This is needed when girepository-1.0 is not installed
and thus not in the library path.
| -rw-r--r-- | gir/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/everything/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/invoke/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/scanner/Makefile.am | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am index 1adccd5..c512363 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -167,7 +167,7 @@ girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(GIRSOURCES) %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) - $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ + LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = $(GIRSOURCES:.gir=.typelib) $(GIRSOURCES:.gir=.typelib) diff --git a/tests/everything/Makefile.am b/tests/everything/Makefile.am index 72daa7d..adda322 100644 --- a/tests/everything/Makefile.am +++ b/tests/everything/Makefile.am @@ -42,7 +42,7 @@ Everything-$(TYPELIB_VERSION).gir: libgirepository-everything-1.0.la everything. GIRS += Everything-$(TYPELIB_VERSION).gir %.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 $@ diff --git a/tests/invoke/Makefile.am b/tests/invoke/Makefile.am index 54c28ff..2902d51 100644 --- a/tests/invoke/Makefile.am +++ b/tests/invoke/Makefile.am @@ -20,7 +20,7 @@ BUILT_SOURCES = testfns-metadata.c CLEANFILES = testfns-metadata.c testfns-metadata.c: testfns-1.0.gir $(top_builddir)/tools/g-ir-compiler Makefile - $(CHECK_DEBUG) $(top_builddir)/tools/g-ir-compiler $(srcdir)/testfns-1.0.gir --code -o testfns-metadata.c + LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(CHECK_DEBUG) $(top_builddir)/tools/g-ir-compiler $(srcdir)/testfns-1.0.gir --code -o testfns-metadata.c invoke_SOURCES = invoke.c invoke_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index dd35329..d8c96fa 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; \ |