diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2009-08-13 23:06:51 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-08-17 00:22:19 -0400 |
| commit | fa71c815d441ab922b1e5501f534f2c3d1fceef8 (patch) | |
| tree | a86335d50e2fe924969ca29c6ef40b6aecdb338e /tests/offsets | |
| parent | af6bcb48d777f683384d9b8497e1b0edba5b16e7 (diff) | |
| download | gobject-introspection-fa71c815d441ab922b1e5501f534f2c3d1fceef8.tar.gz | |
Support passing --library=lib<foo>.la
In addition to the current --library=<foo>, support --library=lib<foo>.la.
This makes it unambiguous that we are referencing an uninstalled
library and allows accurate extraction of the shared library name
for the uninstalled library.
* tests/scanner/Makefile.am tests/offsets/Makefile.am: Use the
new form of --library=. Also some LD_LIBRARY_PATH frobbing as needed.
*-expected.gir *-expected.tgir: We now pick out the shared library
accurately, so fix shared-library="" in our reference girs. (The
comparison may need some pre-sanitization now to work on non-ELF)
http://bugzilla.gnome.org/show_bug.cgi?id=591669
Diffstat (limited to 'tests/offsets')
| -rw-r--r-- | tests/offsets/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am index b292ef6e..c725bbc0 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -22,7 +22,7 @@ offsets-1.0.gir: liboffsets.la offsets.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(CHECK_DEBUG) $(SCANNER) \ --include=GObject-2.0 \ --libtool="$(SHAVE_SAVED_LIBTOOL)" \ - --library=offsets \ + --library=liboffsets.la \ --namespace=offsets \ --nsversion=1.0 \ --pkg gobject-2.0 \ @@ -30,7 +30,8 @@ offsets-1.0.gir: liboffsets.la offsets.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile --output $@ %.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=$(top_builddir)/girepository/.libs:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \ + $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ CLEANFILES += offsets-1.0.gir offsets-1.0.typelib @@ -52,8 +53,8 @@ CLEANFILES += gitestoffsets.c ############################################################ check-local: offsets-1.0.typelib - LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:} GI_TYPELIB_PATH=:$(top_builddir)/gir \ - gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected + LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \ + GI_TYPELIB_PATH=:$(top_builddir)/gir gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected diff -u offsets.compiled offsets.introspected CLEANFILES += offsets.compiled offsets.introspected |