gbm: install libgbm.so into lib

This partially reverts commit 90e2568534.
This commit is contained in:
Matt Turner 2012-01-24 11:14:42 -05:00
parent fba8257f6a
commit a208468e04
4 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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