summaryrefslogtreecommitdiffstats
path: root/src/mapi/vgapi
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2012-03-16 12:55:40 -0400
committerKristian Høgsberg <krh@bitplanet.net>2012-03-19 11:13:06 -0400
commitca760181b4420696c7e86aa2951d7203522ad1e8 (patch)
tree88e11d719bbd0963594645ab4d16c9c051b8eace /src/mapi/vgapi
parent91ddfa72b4384d04e4d84e60b4cdf3efee7ef49b (diff)
downloadexternal_mesa3d-ca760181b4420696c7e86aa2951d7203522ad1e8.zip
external_mesa3d-ca760181b4420696c7e86aa2951d7203522ad1e8.tar.gz
external_mesa3d-ca760181b4420696c7e86aa2951d7203522ad1e8.tar.bz2
shared-glapi: Convert to automake
This fixes a build problem where EGL links to libgbm.la, which encodes a relative path to it's libglapi.so dependency. The relative path breaks when the linker tries to resolve it from src/egl/main instead of src/gbm. Typically we silently fall back to the system libglapi.so, which is wrong and breaks when there isn't one. Morale of the story: don't mix mklib and libtool.
Diffstat (limited to 'src/mapi/vgapi')
-rw-r--r--src/mapi/vgapi/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapi/vgapi/Makefile b/src/mapi/vgapi/Makefile
index 68cf26e..91766f0 100644
--- a/src/mapi/vgapi/Makefile
+++ b/src/mapi/vgapi/Makefile
@@ -10,8 +10,8 @@ VG_LIB_PATCH = 0
MAPI := $(TOP)/src/mapi/mapi
include $(MAPI)/sources.mak
-VGAPI_SOURCES := $(addprefix $(MAPI)/, $(MAPI_SOURCES))
-VGAPI_OBJECTS := $(MAPI_SOURCES:.c=.o)
+VGAPI_SOURCES := $(MAPI_FILES)
+VGAPI_OBJECTS := $(notdir $(MAPI_FILES:.c=.o))
VGAPI_CPPFLAGS := -DMAPI_ABI_HEADER=\"vgapi/vgapi_tmp.h\"