[gobject-introspection] autoconf-2.64 compat: Don't use $(builddir)
- From: Colin Walters <walters src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gobject-introspection] autoconf-2.64 compat: Don't use $(builddir)
- Date: Mon, 17 Aug 2009 04:07:57 +0000 (UTC)
commit 19db6454c48b6d8e4a0f033cf6c1d2b4be66f6c7
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Mon Aug 17 00:07:35 2009 -0400
autoconf-2.64 compat: Don't use $(builddir)
$(builddir) is not a standard automake variable. With autoconf < 2.64
it ends up getting set in every Makefile.in to '.' (because autoconf
defines it), but that is no longer the case for 2.64.
Since $(builddir) was always '.', just use that instead.
gir/Makefile.am | 2 +-
tests/offsets/Makefile.am | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gir/Makefile.am b/gir/Makefile.am
index caffabd..d47b180 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -206,7 +206,7 @@ girdir = $(GIR_DIR)
dist_gir_DATA = $(GIRSOURCES)
%.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT)
- LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:$(builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
+ LD_LIBRARY_PATH=$(top_builddir)/girepository/.libs:.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
typelibsdir = $(libdir)/girepository-1.0
typelibs_DATA = $(GIRSOURCES:.gir=.typelib)
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am
index 75dba3c..b292ef6 100644
--- a/tests/offsets/Makefile.am
+++ b/tests/offsets/Makefile.am
@@ -52,8 +52,8 @@ CLEANFILES += gitestoffsets.c
############################################################
check-local: offsets-1.0.typelib
- LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(builddir) GI_TYPELIB_PATH=$(builddir):$(top_builddir)/gir \
- $(builddir)/gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected
+ LD_LIBRARY_PATH=$${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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]