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/scanner/Makefile.am | |
| 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/scanner/Makefile.am')
| -rw-r--r-- | tests/scanner/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 36aedbf7..2c6ac7ab 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -43,7 +43,7 @@ annotation-1.0.gir: libannotation.la annotation.c annotation.h utility-1.0.gir $ --include=GObject-2.0 \ --include=utility-1.0 \ --libtool="$(LIBTOOL)" \ - --library=annotation \ + --library=libannotation.la \ --namespace=annotation \ --nsversion=1.0 \ --pkg gobject-2.0 \ @@ -56,7 +56,7 @@ drawable-1.0.gir: libdrawable.la drawable.c drawable.h utility-1.0.gir $(SCANNER --include=GObject-2.0 \ --include=utility-1.0 \ --libtool="$(LIBTOOL)" \ - --library=drawable \ + --library=libdrawable.la \ --namespace=drawable \ --nsversion=1.0 \ --pkg gobject-2.0 \ @@ -70,7 +70,7 @@ foo-1.0.gir: libfoo.la foo.c foo.h utility-1.0.gir $(SCANNER_BIN) $(SCANNER_LIBS --include=utility-1.0 \ --c-include="foo.h" \ --libtool="$(LIBTOOL)" \ - --library=foo \ + --library=libfoo.la \ --namespace=foo \ --nsversion=1.0 \ --pkg gobject-2.0 \ @@ -82,7 +82,7 @@ utility-1.0.gir: libutility.la utility.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(CHECK_DEBUG) $(SCANNER) \ --include=GObject-2.0 \ --libtool="$(LIBTOOL)" \ - --library=utility \ + --library=libutility.la \ --namespace=utility \ --nsversion=1.0 \ --pkg gobject-2.0 \ @@ -95,7 +95,7 @@ GtkFrob-1.0.gir: libgtkfrob.la gtkfrob.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(CHECK_DEBUG) $(SCANNER) \ --include=GObject-2.0 \ --libtool="$(LIBTOOL)" \ - --library=gtkfrob \ + --library=libgtkfrob.la \ --namespace=GtkFrob \ --strip-prefix=Gtk \ --nsversion=1.0 \ |