diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2009-08-17 13:17:01 -0400 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2009-08-20 16:09:54 -0400 |
| commit | d6d63e42d19f62357f173da6c0b7f23fbf57825f (patch) | |
| tree | ba6f88d8108f766b6fe99db8a991bd2761657616 | |
| parent | efa7266bcf78478ce62e8dd778a4f0417bfd4d15 (diff) | |
| download | gobject-introspection-d6d63e42d19f62357f173da6c0b7f23fbf57825f.tar.gz | |
Remove some $(builddir) that crept back in
With recent merges, a few instances of $(builddir) got reintroduced.
Remove them.
http://bugzilla.gnome.org/show_bug.cgi?id=592114
| -rw-r--r-- | tests/offsets/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/scanner/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am index e27bedbe..62b0d79c 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -30,7 +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:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \ + 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 $@ CLEANFILES += offsets-1.0.gir offsets-1.0.typelib @@ -53,7 +53,7 @@ CLEANFILES += gitestoffsets.c ############################################################ check-local: offsets-1.0.typelib - LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \ + 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 diff -u offsets.compiled offsets.introspected diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 1c6c6c0d..13177085 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:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + 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 $@ %.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile - LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ + 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 $@ %.tgir.check: %.tgir @diff -u -U 10 $(srcdir)/$*-expected.tgir $*.tgir; \ |