Module: Mesa
Branch: master
Commit: fe5fddd7e2df74233a2a02ae021418485f39d11c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe5fddd7e2df74233a2a02ae021418485f39d11c
Author: Emil Velikov <emil.l.veli...@gmail.com>
Date: Mon Mar 2 15:58:20 2015 +0000
mapi: fix *glapi dependency tracking
I.e. add {shared-,}glapi/glapi_mapi_tmp.h to the SOURCES list. Otherwise
there will be no knowledge that the file is required by others for the
build. Thus autotools won't pick it up for the distribution tarball.
v2: Don't forget about the static glapi. Spotted by Matt.
Cc: "10.5" <mesa-sta...@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
Reviewed-by: Matt Turner <matts...@gmail.com>
---
src/mapi/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index ef6f5ee..50c5b2e 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -69,7 +69,7 @@ if HAVE_SHARED_GLAPI
BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
lib_LTLIBRARIES += shared-glapi/libglapi.la
-shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)
+shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)
shared-glapi/glapi_mapi_tmp.h
shared_glapi_libglapi_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DMAPI_MODE_GLAPI \
@@ -118,7 +118,7 @@ glapi_libglapi_la_CPPFLAGS = \
-I$(top_srcdir)/src/mesa
if HAVE_SHARED_GLAPI
-glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES)
+glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES) glapi/glapi_mapi_tmp.h
glapi_libglapi_la_CPPFLAGS += \
-DMAPI_MODE_BRIDGE \
-DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\"
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
