This reverts commit ca760181b4420696c7e86aa2951d7203522ad1e8.
That commit broke the Android build. The guilty change in that commit was
twofold. It first changed the pattern of some variable definitions, then
made a illegal change in Android.mk
src/mapi/mapi/sources.mak
- FOO_FILE := bar.c
+ FOO_FILE := $(TOP)/src/mapi/mapi/bar.c
src/mapi/Android.mk
-LOCAL_SRC_FILES := $(MAPI_GLAPI_FILES)
+LOCAL_SRC_FILES := $(addprefix mapi/, $(MAPI_GLAPI_SOURCES))
Source filepaths in Android makefiles must be relative to the makefile.
CC: Kristian Høgsberg k...@bitplanet.net
Signed-off-by: Chad Versace chad.vers...@linux.intel.com
---
configure.ac |2 -
src/egl/main/Makefile.am |1 +
src/gbm/Makefile.am |4 +-
src/glx/Makefile.am |2 +-
src/mapi/Android.mk |4 +-
src/mapi/es1api/Makefile |4 +-
src/mapi/glapi/Makefile |8 ++--
src/mapi/mapi/sources.mak | 42
src/mapi/shared-glapi/Makefile| 65 +
src/mapi/shared-glapi/Makefile.am | 27 ---
src/mapi/vgapi/Makefile |4 +-
11 files changed, 100 insertions(+), 63 deletions(-)
create mode 100644 src/mapi/shared-glapi/Makefile
delete mode 100644 src/mapi/shared-glapi/Makefile.am
diff --git a/configure.ac b/configure.ac
index 21e4308..49b067d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -702,7 +702,6 @@ if test x$enable_shared_glapi = xyes; then
# libGL will use libglapi for function lookups (IN_DRI_DRIVER means to use
# the remap table)
DEFINES=$DEFINES -DIN_DRI_DRIVER
-SRC_DIRS=$SRC_DIRS mapi/shared-glapi
fi
AC_SUBST([SHARED_GLAPI])
AM_CONDITIONAL(HAVE_SHARED_GLAPI, test $SHARED_GLAPI = 1)
@@ -1998,7 +1997,6 @@ AC_CONFIG_FILES([configs/autoconf
src/egl/wayland/wayland-egl/wayland-egl.pc
src/egl/wayland/wayland-drm/Makefile
src/glx/Makefile
- src/mapi/shared-glapi/Makefile
src/mesa/drivers/dri/dri.pc
src/mesa/drivers/dri/Makefile
src/mesa/drivers/dri/common/Makefile
diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index 9c3935b..a8072c1 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -93,6 +93,7 @@ endif
if HAVE_EGL_PLATFORM_DRM
AM_CFLAGS += -DHAVE_DRM_PLATFORM
libEGL_la_LIBADD += ../../gbm/libgbm.la
+libEGL_la_LIBADD += ../../gbm/libgbm.la
endif
if HAVE_EGL_PLATFORM_FBDEV
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index dede5bc..1dbc9d1 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -31,8 +31,8 @@ libgbm_dri_la_CFLAGS = \
-DDEFAULT_DRIVER_DIR='$(DRI_DRIVER_SEARCH_DIR)' \
$(LIBDRM_CFLAGS)
-libgbm_la_LIBADD += \
- libgbm_dri.la $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+libgbm_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR)
+libgbm_la_LIBADD += libgbm_dri.la -lglapi
endif
all-local: libgbm.la
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index ec62faa..062ed9e 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -21,7 +21,7 @@
if HAVE_SHARED_GLAPI
SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
-SHARED_GLAPI_LIBS = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+SHARED_GLAPI_LIBS = -L$(top_builddir)/$(LIB_DIR) -lglapi
endif
GLAPI_LIB = ../mapi/glapi/libglapi.a
diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk
index b75361f..fe9e40e 100644
--- a/src/mapi/Android.mk
+++ b/src/mapi/Android.mk
@@ -25,7 +25,7 @@
LOCAL_PATH := $(call my-dir)
-# get MAPI_GLAPI_FILES
+# get MAPI_GLAPI_SOURCES
include $(LOCAL_PATH)/mapi/sources.mak
mapi_abi_headers :=
@@ -38,7 +38,7 @@ include $(CLEAR_VARS)
abi_header := shared-glapi/glapi_mapi_tmp.h
-LOCAL_SRC_FILES := $(MAPI_GLAPI_FILES)
+LOCAL_SRC_FILES := $(addprefix mapi/, $(MAPI_GLAPI_SOURCES))
LOCAL_CFLAGS := \
-DMAPI_MODE_GLAPI \
diff --git a/src/mapi/es1api/Makefile b/src/mapi/es1api/Makefile
index a9c9123..0a0449b 100644
--- a/src/mapi/es1api/Makefile
+++ b/src/mapi/es1api/Makefile
@@ -41,8 +41,8 @@ esapi_CPPFLAGS := \
-DMAPI_ABI_HEADER=\$(ESAPI)/glapi_mapi_tmp.h\
include $(MAPI)/sources.mak
-esapi_SOURCES := $(MAPI_BRIDGE_FILES)
-esapi_OBJECTS := $(notdir $(MAPI_BRIDGE_FILES:.c=.o))
+esapi_SOURCES := $(addprefix $(MAPI)/, $(MAPI_BRIDGE_SOURCES))
+esapi_OBJECTS := $(MAPI_BRIDGE_SOURCES:.c=.o)
esapi_CPPFLAGS += -DMAPI_MODE_BRIDGE
esapi_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(esapi_LIB_DEPS)
diff --git a/src/mapi/glapi/Makefile b/src/mapi/glapi/Makefile
index 211f384..bb4ed65 100644
--- a/src/mapi/glapi/Makefile
+++ b/src/mapi/glapi/Makefile
@@ -19,18 +19,18 @@ ifeq ($(SHARED_GLAPI),1)
glapi_CPPFLAGS += \
-DMAPI_MODE_BRIDGE \
-DMAPI_ABI_HEADER=\glapi/glapi_mapi_tmp.h\
-glapi_SOURCES := $(MAPI_BRIDGE_FILES)
+glapi_SOURCES := $(addprefix $(MAPI)/, $(MAPI_BRIDGE_SOURCES))
