diff options
| author | Kristian Høgsberg <[email protected]> | 2012-03-16 12:55:40 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2012-03-19 11:13:06 -0400 |
| commit | ca760181b4420696c7e86aa2951d7203522ad1e8 (patch) | |
| tree | 88e11d719bbd0963594645ab4d16c9c051b8eace /src/mapi/glapi | |
| parent | 91ddfa72b4384d04e4d84e60b4cdf3efee7ef49b (diff) | |
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/glapi')
| -rw-r--r-- | src/mapi/glapi/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mapi/glapi/Makefile b/src/mapi/glapi/Makefile index bb4ed6585d9..211f384a77c 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 := $(addprefix $(MAPI)/, $(MAPI_BRIDGE_SOURCES)) +glapi_SOURCES := $(MAPI_BRIDGE_FILES) glapi_GLAPI_OBJECTS := glapi_ASM_OBJECTS := -glapi_MAPI_OBJECTS := $(MAPI_BRIDGE_SOURCES:.c=.o) +glapi_MAPI_OBJECTS := $(notdir $(MAPI_BRIDGE_FILES:.c=.o)) else glapi_CPPFLAGS += -DMAPI_MODE_UTIL -glapi_SOURCES := $(GLAPI_SOURCES) $(addprefix $(MAPI)/, $(MAPI_UTIL_SOURCES)) +glapi_SOURCES := $(GLAPI_SOURCES) $(MAPI_UTIL_FILES) glapi_GLAPI_OBJECTS := $(GLAPI_SOURCES:.c=.o) glapi_ASM_OBJECTS := $(GLAPI_ASM_SOURCES:.S=.o) -glapi_MAPI_OBJECTS := $(MAPI_UTIL_SOURCES:.c=.o) +glapi_MAPI_OBJECTS := $(notdir $(MAPI_UTIL_FILES:.c=.o)) endif # SHARED_GLAPI glapi_OBJECTS := \ |