gbm: install libgbm.so into lib

This partially reverts commit 90e256853418eaaba3717f930cc6a331e4099056.

diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 25fb3c50bd6709d4b413c9a300194277c6d1cfee..57fb691ea9d05c5f32e69892759eb74584bc9770 100644 (file)
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -77,7 +77,6 @@ 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 92b72665f10c60b7117ade40c40a2384f33a2185..9e8777402cb2c369e04b3a0cde4e850a162fd92f 100644 (file)
--- a/src/gallium/targets/egl-static/Makefile
+++ b/src/gallium/targets/egl-static/Makefile
@@ -58,7 +58,6 @@ 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/Makefile.am b/src/gbm/Makefile.am
index f874f6411a3ad5539e32276649c719a1be71ac05..d18d35c4e39412edf3efee903a7c56c312b9a692 100644 (file)
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -32,3 +32,7 @@ libgbm_dri_la_CFLAGS = \
 
 libgbm_la_LIBADD = libgbm_dri.la
 endif
+
+all-local: libgbm.la
+       $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+       ln -f .libs/libgbm.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libgbm.so

diff --git a/src/gbm/backends/Makefile.template b/src/gbm/backends/Makefile.template
index 448dd77d9643bd1b162643d3ec7dd6b2e6440ce6..1c8f924909eda6a0434cb16ef0f203057a4594b3 100644 (file)
--- a/src/gbm/backends/Makefile.template
+++ b/src/gbm/backends/Makefile.template
@@ -26,7 +26,7 @@ $(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)/src/gbm/.libs $(LDFLAGS)' \
+               -linker '$(CC)' -ldflags '-L$(TOP)/$(LIB_DIR) $(LDFLAGS)' \
                $(MKLIB_OPTIONS) \
                $(GBM_OBJECTS) $(GBM_LIBS) -lgbm