[Mesa-dev] [PATCH 12/21] Also do it for egl_gallium.so, pipe_*.so and gbm_gallium_drm.

Wed Sep 11 15:32:50 PDT 2013

---
 configure.ac                                  |  7 -------
 src/egl/main/Makefile.am                      |  2 +-
 src/gallium/state_trackers/clover/Makefile.am |  2 +-
 src/gallium/targets/egl-static/Makefile.am    |  3 +--
 src/gallium/targets/gbm/Makefile.am           |  6 ++----
 src/gallium/targets/pipe-loader/Makefile.am   | 19 +++++++++----------
 src/gbm/Makefile.am                           |  2 +-
 7 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/configure.ac b/configure.ac
index a4e11d5..1a98626 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1459,13 +1459,6 @@ if ! echo "$egl_platforms" | grep -q 'x11'; then
     GL_PC_CFLAGS="$GL_PC_CFLAGS -DMESA_EGL_NO_X11_HEADERS"
 fi
 
-AC_ARG_WITH([egl-driver-dir],
-    [AS_HELP_STRING([--with-egl-driver-dir=DIR],
-                    [directory for EGL drivers [[default=${libdir}/egl]]])],
-    [EGL_DRIVER_INSTALL_DIR="$withval"],
-    [EGL_DRIVER_INSTALL_DIR='${libdir}/egl'])
-AC_SUBST([EGL_DRIVER_INSTALL_DIR])
-
 AC_ARG_WITH([xorg-driver-dir],
     [AS_HELP_STRING([--with-xorg-driver-dir=DIR],
                     [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])],
diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index b81aeb5..8dc688e 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -30,7 +30,7 @@ AM_CFLAGS = \
 	$(VISIBILITY_CFLAGS) \
 	$(EGL_CFLAGS) \
 	-D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \
-	-D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\" \
+	-D_EGL_DRIVER_SEARCH_DIR=\"$(mesalibdir)\" \
 	-D_EGL_OS_UNIX=1
 
 lib_LTLIBRARIES = libEGL.la
diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am
index b4c197a..fd38766 100644
--- a/src/gallium/state_trackers/clover/Makefile.am
+++ b/src/gallium/state_trackers/clover/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 AM_CPPFLAGS = \
 	$(GALLIUM_PIPE_LOADER_DEFINES) \
-	-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \
+	-DPIPE_SEARCH_DIR=\"$(mesalibdir)\" \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/gallium/include \
 	-I$(top_srcdir)/src/gallium/drivers \
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 84e9463..5b000f2 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -42,8 +42,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/egl/main \
 	-D_EGL_MAIN=_eglMain
 
-egldir = $(EGL_DRIVER_INSTALL_DIR)
-egl_LTLIBRARIES = egl_gallium.la
+mesalib_LTLIBRARIES = egl_gallium.la
 
 nodist_EXTRA_egl_gallium_la_SOURCES = dummy.cpp
 egl_gallium_la_SOURCES = \
diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am
index 02ba233..0be49eb 100644
--- a/src/gallium/targets/gbm/Makefile.am
+++ b/src/gallium/targets/gbm/Makefile.am
@@ -22,22 +22,20 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-gbmdir = $(libdir)/gbm
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/gallium/state_trackers/gbm \
 	-I$(top_srcdir)/src/gbm/main \
 	-I$(top_srcdir)/src/gallium/winsys \
 	$(GALLIUM_PIPE_LOADER_DEFINES) \
-	-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
+	-DPIPE_SEARCH_DIR=\"$(mesalibdir)\"
 
 AM_CFLAGS = \
 	$(GALLIUM_CFLAGS) \
 	$(LIBUDEV_CFLAGS) \
 	$(LIBDRM_CFLAGS)
 
-gbm_LTLIBRARIES = gbm_gallium_drm.la
+mesalib_LTLIBRARIES = gbm_gallium_drm.la
 
 gbm_gallium_drm_la_SOURCES = gbm.c
 
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 5461fc1..af668de 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -32,8 +32,7 @@ AM_CPPFLAGS = \
 	-DGALLIUM_TRACE \
 	-DGALLIUM_GALAHAD
 
-pipedir = $(libdir)/gallium-pipe
-pipe_LTLIBRARIES =
+mesalib_LTLIBRARIES =
 
 PIPE_LIBS = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
@@ -46,7 +45,7 @@ PIPE_LIBS = \
 	-lm
 
 if HAVE_GALLIUM_I915
-pipe_LTLIBRARIES += pipe_i915.la
+mesalib_LTLIBRARIES += pipe_i915.la
 pipe_i915_la_SOURCES = pipe_i915.c
 pipe_i915_la_LIBADD = \
 	$(PIPE_LIBS) \
@@ -58,7 +57,7 @@ pipe_i915_la_LDFLAGS = -Wl,--no-undefined -shared -module -avoid-version
 endif
 
 if HAVE_GALLIUM_NOUVEAU
-pipe_LTLIBRARIES += pipe_nouveau.la
+mesalib_LTLIBRARIES += pipe_nouveau.la
 pipe_nouveau_la_SOURCES = pipe_nouveau.c
 pipe_nouveau_la_LIBADD = \
 	$(PIPE_LIBS) \
@@ -69,7 +68,7 @@ pipe_nouveau_la_LDFLAGS = -Wl,--no-undefined -shared -module -avoid-version
 endif
 
 if HAVE_GALLIUM_R300
-pipe_LTLIBRARIES += pipe_r300.la
+mesalib_LTLIBRARIES += pipe_r300.la
 pipe_r300_la_SOURCES = pipe_r300.c
 pipe_r300_la_LIBADD = \
 	$(PIPE_LIBS) \
@@ -82,7 +81,7 @@ pipe_r300_la_LDFLAGS = -Wl,--no-undefined -shared -module -avoid-version
 endif
 
 if HAVE_GALLIUM_R600
-pipe_LTLIBRARIES += pipe_r600.la
+mesalib_LTLIBRARIES += pipe_r600.la
 pipe_r600_la_SOURCES = pipe_r600.c
 pipe_r600_la_LIBADD = \
 	$(PIPE_LIBS) \
@@ -96,7 +95,7 @@ pipe_r600_la_LDFLAGS = -Wl,--no-undefined -shared -module -avoid-version
 endif
 
 if HAVE_GALLIUM_RADEONSI
-pipe_LTLIBRARIES += pipe_radeonsi.la
+mesalib_LTLIBRARIES += pipe_radeonsi.la
 pipe_radeonsi_la_SOURCES = pipe_radeonsi.c
 pipe_radeonsi_la_LIBADD = \
 	$(PIPE_LIBS) \
@@ -110,7 +109,7 @@ pipe_radeonsi_la_LDFLAGS = -Wl,--no-undefined -shared -module -avoid-version
 endif
 
 if HAVE_GALLIUM_SVGA
-pipe_LTLIBRARIES += pipe_vmwgfx.la
+mesalib_LTLIBRARIES += pipe_vmwgfx.la
 pipe_vmwgfx_la_SOURCES = pipe_vmwgfx.c
 pipe_vmwgfx_la_LIBADD = \
 	$(PIPE_LIBS) \
@@ -121,7 +120,7 @@ pipe_vmwgfx_la_LDFLAGS = -Wl,--no-undefined -shared -module -avoid-version
 endif
 
 if HAVE_GALLIUM_LLVMPIPE
-pipe_LTLIBRARIES += pipe_swrast.la
+mesalib_LTLIBRARIES += pipe_swrast.la
 pipe_swrast_la_SOURCES = pipe_swrast.c
 pipe_swrast_la_LIBADD = \
 	$(PIPE_LIBS) \
@@ -129,7 +128,7 @@ pipe_swrast_la_LIBADD = \
 pipe_swrast_la_LDFLAGS = -Wl,--no-undefined -shared -module -avoid-version
 else
 if HAVE_GALLIUM_SOFTPIPE
-pipe_LTLIBRARIES += pipe_swrast.la
+mesalib_LTLIBRARIES += pipe_swrast.la
 pipe_swrast_la_SOURCES = pipe_swrast.c
 pipe_swrast_la_LIBADD = \
 	$(PIPE_LIBS) \
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 4c27056..440d4e0 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -3,7 +3,7 @@ pkgconfig_DATA = main/gbm.pc
 
 AM_CFLAGS = \
 	-D_OS_UNIX=1 \
-	-DMODULEDIR='"$(libdir)/gbm"' \
+	-DMODULEDIR='"$(mesalibdir)"' \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/gbm/main \
 	$(LIBUDEV_CFLAGS) \
-- 
1.8.1.4

