From 3c87dfce403ad3c2fed7998b16bea34dcb0c9fde Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 14 Jan 2012 21:57:32 -0500 Subject: [PATCH] automake: src/mesa/drivers/dri/i915 --- configs/linux-dri | 2 +- configure.ac | 17 ++++-- src/mesa/drivers/dri/i915/.gitignore | 5 ++ 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 +- 7 files changed, 83 insertions(+), 38 deletions(-) create mode 100644 src/mesa/drivers/dri/i915/.gitignore 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 dde64089719..0771f574646 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 009a8c08313..a0ea317cb36 100644 --- a/configure.ac +++ b/configure.ac @@ -1257,15 +1257,21 @@ case $DRI_DIRS in *i915*|*i965*) PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) - case $DRI_DIRS in - *i965*) - HAVE_I965_DRI=yes; - ;; - esac + for d in $(echo $DRI_DIRS | sed 's/,/ /g'); do + case $d in + i915) + HAVE_I915_DRI=yes; + ;; + i965) + HAVE_I965_DRI=yes; + ;; + esac + done ;; 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 @@ -1904,6 +1910,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/.gitignore b/src/mesa/drivers/dri/i915/.gitignore new file mode 100644 index 00000000000..1c73565035b --- /dev/null +++ b/src/mesa/drivers/dri/i915/.gitignore @@ -0,0 +1,5 @@ +.deps +.libs +Makefile +Makefile.in +i915_dri.la diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk index b615e9b753d..6964fb1eb93 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 b7da46bc3b6..00000000000 --- 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 00000000000..6bc7061f1e0 --- /dev/null +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -0,0 +1,63 @@ + + +# Copyright © 2012 Matt Turner +# +# 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_CFLAGS = \ + -DI915 \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/mesa/drivers/dri/common \ + -I$(top_srcdir)/src/mesa/drivers/dri/intel \ + -I$(top_srcdir)/src/mesa/drivers/dri/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 d961c073324..efbc46b11b4 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 \ -- 2.30.2