On 01/17/2012 12:58 PM, Matt Turner wrote:
---
configs/linux-dri | 2 +-
configure.ac | 7 +++
src/mesa/drivers/dri/i915/Android.mk | 2 +-
src/mesa/drivers/dri/i915/Makefile | 30 -------------
src/mesa/drivers/dri/i915/Makefile.am | 63 ++++++++++++++++++++++++++++
src/mesa/drivers/dri/i915/Makefile.sources | 2 +-
6 files changed, 73 insertions(+), 33 deletions(-)
delete mode 100644 src/mesa/drivers/dri/i915/Makefile
create mode 100644 src/mesa/drivers/dri/i915/Makefile.am
diff --git a/configs/linux-dri b/configs/linux-dri
index dde6408..0771f57 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -62,7 +62,7 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel svga/drm
GALLIUM_TARGET_DIRS = dri-vmwgfx
GALLIUM_STATE_TRACKERS_DIRS = egl dri
-DRI_DIRS = i915 nouveau r200 radeon swrast
+DRI_DIRS = nouveau r200 radeon swrast
INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel)
INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
diff --git a/configure.ac b/configure.ac
index f3f5e3e..1b6a047 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1292,6 +1292,11 @@ case $DRI_DIRS in
PKG_CHECK_MODULES([INTEL], [libdrm_intel>= $LIBDRM_INTEL_REQUIRED])
case $DRI_DIRS in
+ *i915*)
+ HAVE_I915_DRI=yes;
+ ;;
+ esac
+ case $DRI_DIRS in
Why are these in separate case statements?
*i965*)
HAVE_I965_DRI=yes;
;;
@@ -1300,6 +1305,7 @@ case $DRI_DIRS in
;;
esac
+AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)
AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes)
case $DRI_DIRS in
@@ -1941,6 +1947,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
dnl Substitute the config
AC_CONFIG_FILES([configs/autoconf
+ src/mesa/drivers/dri/i915/Makefile
src/mesa/drivers/dri/i965/Makefile
tests/Makefile
tests/glx/Makefile])
diff --git a/src/mesa/drivers/dri/i915/Android.mk
b/src/mesa/drivers/dri/i915/Android.mk
index b615e9b..6964fb1 100644
--- a/src/mesa/drivers/dri/i915/Android.mk
+++ b/src/mesa/drivers/dri/i915/Android.mk
@@ -42,7 +42,7 @@ LOCAL_C_INCLUDES := \
$(DRM_TOP)/intel
LOCAL_SRC_FILES := \
- $(i915_C_SOURCES)
+ $(i915_C_FILES)
LOCAL_WHOLE_STATIC_LIBRARIES := \
$(MESA_DRI_WHOLE_STATIC_LIBRARIES)
diff --git a/src/mesa/drivers/dri/i915/Makefile
b/src/mesa/drivers/dri/i915/Makefile
deleted file mode 100644
index b7da46b..0000000
--- a/src/mesa/drivers/dri/i915/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = i915_dri.so
-
-include ../Makefile.defines
-
-# Import variables i915_*.
-include Makefile.sources
-
-C_SOURCES = \
- $(COMMON_SOURCES) \
- $(i915_C_SOURCES)
-
-ASM_SOURCES =
-
-DRIVER_DEFINES = $(addprefix -I$(TOP)/, $(i915_INCLUDES)) -DI915 \
- $(shell $(PKG_CONFIG) libdrm --atleast-version=2.3.1 \
- && echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP")
-
-INCLUDES += $(INTEL_CFLAGS)
-DRI_LIB_DEPS += $(INTEL_LIBS)
-
-include ../Makefile.targets
-
-intel_decode.o: ../intel/intel_decode.c
-
-intel_tex_layout.o: ../intel/intel_tex_layout.c
-
diff --git a/src/mesa/drivers/dri/i915/Makefile.am
b/src/mesa/drivers/dri/i915/Makefile.am
new file mode 100644
index 0000000..ed59a2f
--- /dev/null
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -0,0 +1,63 @@
+
+
+# Copyright © 2011 Matt Turner<matts...@gmail.com>
2012?
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+include Makefile.sources
+
+# Hack to make some of the non-automake variables work.
+TOP=$(top_builddir)
+
+AM_CPPFLAGS = \
+ -DI915 \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/ \
+ -I$(top_srcdir)/src/mapi \
+ -I$(top_srcdir)/src/mesa/ \
+ -I../common \
+ -I../intel \
+ -I../intel/server \
+ $(DEFINES) \
+ $(ASM_FLAGS) \
+ $(API_DEFINES) \
+ $(INTEL_CFLAGS)
+
+dridir = $(DRI_DRIVER_INSTALL_DIR)
+
+if HAVE_I915_DRI
+dri_LTLIBRARIES = i915_dri.la
+endif
+
+i915_dri_la_SOURCES = \
+ $(i915_C_FILES) \
+ $(i915_CXX_FILES)
+
+i915_dri_la_LDFLAGS = -module -avoid-version -shared
+i915_dri_la_LIBADD = \
+ $(DRI_LIB_DEPS) \
+ $(DRICORE_LIB_DEPS) \
+ $(INTEL_LIBS)
+
+# Provide compatibility with scripts for the old Mesa build system for
+# a while by putting a link to the driver into /lib of the build tree.
+all-local: i915_dri.la
+ $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+ ln -f .libs/i915_dri.so $(top_builddir)/$(LIB_DIR)/i915_dri.so;
diff --git a/src/mesa/drivers/dri/i915/Makefile.sources
b/src/mesa/drivers/dri/i915/Makefile.sources
index d961c07..efbc46b 100644
--- a/src/mesa/drivers/dri/i915/Makefile.sources
+++ b/src/mesa/drivers/dri/i915/Makefile.sources
@@ -2,7 +2,7 @@
i915_INCLUDES := \
src/mesa/drivers/dri/intel
-i915_C_SOURCES := \
+i915_C_FILES := \
i830_context.c \
i830_state.c \
i830_texblend.c \
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
