Module: Mesa Branch: master Commit: 90e256853418eaaba3717f930cc6a331e4099056 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90e256853418eaaba3717f930cc6a331e4099056
Author: Benjamin Franzke <[email protected]> Date: Tue Jan 24 09:24:06 2012 +0100 egl,gbm_gallium: Fix linkage against gbm from automake Add src/gbm/.libs to ldflags. The gbm lib is src/gbm/.libs/ instead of lib/ as of commit 06ad64ad29e7aa9e2d001f6bd1f8c1c1f77050b8. --- src/egl/main/Makefile | 1 + src/gallium/targets/egl-static/Makefile | 1 + src/gbm/backends/Makefile.template | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile index 57fb691..25fb3c5 100644 --- a/src/egl/main/Makefile +++ b/src/egl/main/Makefile @@ -77,6 +77,7 @@ INCLUDE_DIRS += $(WAYLAND_CFLAGS) endif ifneq ($(findstring drm, $(EGL_PLATFORMS)),) EGL_LIB_DEPS += -lgbm +LDFLAGS += -L$(TOP)/src/gbm/.libs INCLUDE_DIRS += -I$(TOP)/src/gbm/main endif diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile index 9e87774..92b7266 100644 --- a/src/gallium/targets/egl-static/Makefile +++ b/src/gallium/targets/egl-static/Makefile @@ -58,6 +58,7 @@ endif ifneq ($(findstring drm, $(EGL_PLATFORMS)),) egl_CPPFLAGS += $(LIBDRM_CFLAGS) egl_SYS += $(LIBDRM_LIB) -lgbm +LDFLAGS += -L$(TOP)/src/gbm/.libs endif ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),) egl_LIBS += $(TOP)/src/gallium/winsys/sw/fbdev/libfbdev.a diff --git a/src/gbm/backends/Makefile.template b/src/gbm/backends/Makefile.template index 851e5c5..f0f1823 100644 --- a/src/gbm/backends/Makefile.template +++ b/src/gbm/backends/Makefile.template @@ -32,9 +32,9 @@ $(GBM_BACKEND_PATH): $(GBM_BACKEND).so $(GBM_BACKEND).so: $(GBM_OBJECTS) Makefile $(TOP)/src/gbm/backends/Makefile.template @$(MKLIB) -o $(GBM_BACKEND).so -noprefix \ - -linker '$(CC)' -ldflags '-L$(TOP)/$(LIB_DIR) $(LDFLAGS)' \ + -linker '$(CC)' -ldflags '-L$(TOP)/src/gbm/.libs $(LDFLAGS)' \ $(MKLIB_OPTIONS) \ - $(GBM_OBJECTS) $(GBM_LIBS) -l$(GBM_LIB) + $(GBM_OBJECTS) $(GBM_LIBS) -lgbm lib$(GBM_BACKEND).a: $(GBM_OBJECTS) Makefile $(TOP)/src/gbm/backends/Makefile.template @$(MKLIB) -o $(GBM_BACKEND) -static $(GBM_OBJECTS) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
