diff options
| author | Colin Walters <walters@verbum.org> | 2009-08-20 18:21:41 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-08-24 14:14:53 -0400 |
| commit | bacb23155a5fb370493d0ce2fc438ea6c2982a45 (patch) | |
| tree | 685b1598528c1fe9f8e54425205197d84dca1338 /tests | |
| parent | 3d4a06e80a46964b2f1a3bfc33403e89022a4163 (diff) | |
| download | gobject-introspection-bacb23155a5fb370493d0ce2fc438ea6c2982a45.tar.gz | |
LD_LIBRARY_PATH exorcism
Thanks to commit 6d510b8db, we now no longer need LD_LIBRARY_PATH
to be set for invoking the compiler.
Next, before we were taking the LD_LIBRARY_PATH variable and
turning it into a compile path, presumably to attempt to handle
the cases where we weren't getting the right -L flags. Also
interacting with this was a while ago we weren't really doing
uninstalled libtool libraries correctly, which is probably
how hacks involving LD_LIBRARY_PATH crept into the scanner.
Just require that we're passed the right -L flags, and we
should be doing libtool libraries better now.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/invoke/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/offsets/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/scanner/Makefile.am | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/tests/invoke/Makefile.am b/tests/invoke/Makefile.am index 2902d514..54c28ffe 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 - 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 + $(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/offsets/Makefile.am b/tests/offsets/Makefile.am index 62b0d79c..1713eb40 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -30,8 +30,7 @@ offsets-1.0.gir: liboffsets.la offsets.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile --output $@ %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) Makefile - LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \ - $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ CLEANFILES += offsets-1.0.gir offsets-1.0.typelib @@ -53,8 +52,7 @@ CLEANFILES += gitestoffsets.c ############################################################ check-local: offsets-1.0.typelib - LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \ - GI_TYPELIB_PATH=:$(top_builddir)/gir ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected + GI_TYPELIB_PATH=:$(top_builddir)/gir ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected diff -u offsets.compiled offsets.introspected CLEANFILES += offsets.compiled offsets.introspected diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 13177085..a14cf8da 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -143,10 +143,10 @@ post-check: @true %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) Makefile - LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ %.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile - LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ %.tgir.check: %.tgir @diff -u -U 10 $(srcdir)/$*-expected.tgir $*.tgir; \ |