In some of the automake files TOP is set to top_srcdir, in some
top_builddir. Since the build looks for generated files under TOP,
top_builddir correct.
Signed-off-by: Christopher James Halse Rogers
<christopher.halse.rog...@canonical.com>
---
src/mapi/shared-glapi/Makefile.am | 2 +-
src/mesa/Makefile.am | 4 ++--
src/mesa/libdricore/Makefile.am | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mapi/shared-glapi/Makefile.am
b/src/mapi/shared-glapi/Makefile.am
index 9485683..85a3677 100644
--- a/src/mapi/shared-glapi/Makefile.am
+++ b/src/mapi/shared-glapi/Makefile.am
@@ -1,6 +1,6 @@
# Used by OpenGL ES or when --enable-shared-glapi is specified
-TOP = $(top_srcdir)
+TOP = $(top_builddir)
GLAPI = $(top_srcdir)/src/mapi/glapi
include $(top_srcdir)/src/mapi/mapi/sources.mak
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index bada760..ecfb165 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -42,8 +42,8 @@ main/git_sha1.h: main/git_sha1.h.tmp
fi
# include glapi_gen.mk for generating glapi headers for GLES
-TOP = $(top_srcdir)
-GLAPI = $(TOP)/src/mapi/glapi/gen
+TOP = $(top_builddir)
+GLAPI = $(top_srcdir)/src/mapi/glapi/gen
include $(GLAPI)/glapi_gen.mk
BUILT_SOURCES = \
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index 26d8a88..4637bf2 100644
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
@@ -19,7 +19,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-TOP=$(top_srcdir)
+TOP=$(top_builddir)
SRCDIR = $(srcdir)/..
include ../sources.mak
GLSL_SRCDIR = $(srcdir)/../../glsl
--
1.7.10.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
