i915: Remove most of the code under gen >= 4 checks.

[mesa.git] / src / mesa / drivers / dri / i965 / Makefile.am

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 574a4992e7acff9daf8822e6a5a8e7011554c239..27c67d10ec0fd8cea8ccc2ce9958d6523cd617fa 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -25,22 +25,29 @@ include Makefile.sources
 
 if HAVE_I965_DRI
 
-# Hack to make some of the non-automake variables work.
-TOP=$(top_builddir)
-
 AM_CFLAGS = \
        -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 \
+       -I$(top_srcdir)/src/gtest/include \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
-       $(API_DEFINES) \
        $(VISIBILITY_CFLAGS) \
        $(INTEL_CFLAGS)
 
+if HAVE_OPENGL_ES1
+AM_CFLAGS += \
+       -DFEATURE_ES1=1
+endif
+
+if HAVE_OPENGL_ES2
+AM_CFLAGS += \
+       -DFEATURE_ES2=1
+endif
+
 AM_CXXFLAGS = $(AM_CFLAGS)
 
 dridir = $(DRI_DRIVER_INSTALL_DIR)
@@ -48,16 +55,14 @@ dridir = $(DRI_DRIVER_INSTALL_DIR)
 noinst_LTLIBRARIES = libi965_dri.la
 dri_LTLIBRARIES = i965_dri.la
 
-libi965_dri_la_SOURCES = \
-       $(i965_C_FILES) \
-       $(i965_CXX_FILES)
+libi965_dri_la_SOURCES = $(i965_FILES)
 
 # list of libs to be linked against by i965_dri.so and i965 test programs.
 COMMON_LIBS = \
        libi965_dri.la \
+       ../common/libdricommon.la \
        $(DRI_LIB_DEPS) \
-       $(INTEL_LIBS) \
-       ../common/libdricommon.la
+       $(INTEL_LIBS)
 
 TEST_LIBS = \
        $(COMMON_LIBS) \
@@ -65,11 +70,20 @@ TEST_LIBS = \
        ../common/libdri_test_stubs.la
 
 i965_dri_la_SOURCES =
+nodist_EXTRA_i965_dri_la_SOURCES = dummy2.cpp
 i965_dri_la_LIBADD = $(COMMON_LIBS)
 i965_dri_la_LDFLAGS = -module -avoid-version -shared
 
-TESTS = test_eu_compact
-check_PROGRAMS = test_eu_compact
+TESTS = \
+        test_eu_compact \
+        test_vec4_register_coalesce
+check_PROGRAMS = $(TESTS)
+
+test_vec4_register_coalesce_SOURCES = \
+       test_vec4_register_coalesce.cpp
+test_vec4_register_coalesce_LDADD = \
+        $(TEST_LIBS) \
+        $(top_builddir)/src/gtest/libgtest.la
 
 test_eu_compact_SOURCES = \
        test_eu_compact.c