From 9053ad07ba7210a5a2f8e7ca36f686fd9f96abe0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 21 Jun 2011 10:26:58 -0400 Subject: [PATCH] Fix a srcdir!=builddir issue, and export that we support it Future jhbuild versions will consume the BUILD API and automatically use a builddir, so mark us as supporting it. --- Makefile.am | 3 +++ gio/tests/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c04c1447a..68b927485 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,9 @@ ## Process this file with automake to produce Makefile.in include $(top_srcdir)/Makefile.decl +# http://people.gnome.org/~walters/docs/build-api.txt +.buildapi-allow-builddir: + ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am index d85343db1..99292544e 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am @@ -259,7 +259,7 @@ gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml --annotate "org.project.Bar.TestPrimitiveTypes()[val_int32]" Key6 Value6 \ --annotate "org.project.Bar.TestPrimitiveTypes()[ret_uint32]" Key7 Value7 \ --annotate "org.project.Bar::TestSignal[array_of_strings]" Key8 Value8 \ - test-codegen.xml \ + $(srcdir)/test-codegen.xml \ $(NULL) BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h