diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2012-03-16 12:55:40 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-03-19 11:13:06 -0400 |
| commit | ca760181b4420696c7e86aa2951d7203522ad1e8 (patch) | |
| tree | 88e11d719bbd0963594645ab4d16c9c051b8eace /src/mapi/es1api | |
| parent | 91ddfa72b4384d04e4d84e60b4cdf3efee7ef49b (diff) | |
| download | external_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/es1api')
| -rw-r--r-- | src/mapi/es1api/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapi/es1api/Makefile b/src/mapi/es1api/Makefile index 0a0449b..a9c9123 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 := $(addprefix $(MAPI)/, $(MAPI_BRIDGE_SOURCES)) -esapi_OBJECTS := $(MAPI_BRIDGE_SOURCES:.c=.o) +esapi_SOURCES := $(MAPI_BRIDGE_FILES) +esapi_OBJECTS := $(notdir $(MAPI_BRIDGE_FILES:.c=.o)) esapi_CPPFLAGS += -DMAPI_MODE_BRIDGE esapi_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(esapi_LIB_DEPS) |