Module: Mesa Branch: master Commit: a208468e04353239f2876cc2013f860b48a4f1c1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a208468e04353239f2876cc2013f860b48a4f1c1
Author: Matt Turner <[email protected]> Date: Tue Jan 24 11:14:42 2012 -0500 gbm: install libgbm.so into lib This partially reverts commit 90e256853418eaaba3717f930cc6a331e4099056. --- src/egl/main/Makefile | 1 - src/gallium/targets/egl-static/Makefile | 1 - src/gbm/Makefile.am | 4 ++++ src/gbm/backends/Makefile.template | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile index 25fb3c5..57fb691 100644 --- 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 92b7266..9e87774 100644 --- 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 f874f64..d18d35c 100644 --- 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 448dd77..1c8f924 100644 --- 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 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
