Commit 90e25685 authored by Benjamin Franzke's avatar Benjamin Franzke 😀
Browse files

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 06ad64ad.
parent 5a84cc4e
......@@ -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
......
......@@ -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
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment