projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5a84cc4)
egl,gbm_gallium: Fix linkage against gbm from automake
authorBenjamin Franzke <benjaminfranzke@googlemail.com>
Tue, 24 Jan 2012 08:24:06 +0000 (09:24 +0100)
committerBenjamin Franzke <benjaminfranzke@googlemail.com>
Tue, 24 Jan 2012 09:00:52 +0000 (10:00 +0100)
Add src/gbm/.libs to ldflags.
The gbm lib is src/gbm/.libs/ instead of lib/
as of commit 06ad64ad29e7aa9e2d001f6bd1f8c1c1f77050b8.

src/egl/main/Makefile patch | blob | history
src/gallium/targets/egl-static/Makefile patch | blob | history
src/gbm/backends/Makefile.template patch | blob | history

diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 57fb691ea9d05c5f32e69892759eb74584bc9770..25fb3c50bd6709d4b413c9a300194277c6d1cfee 100644 (file)
--- 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 9e8777402cb2c369e04b3a0cde4e850a162fd92f..92b72665f10c60b7117ade40c40a2384f33a2185 100644 (file)
--- 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 851e5c56217b8ce675d6894433401edc6f3e2dc5..f0f182317b4875ac018d08f8368516fe46f8e7ce 100644 (file)
--- 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)