diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/Android.mk | 5 | ||||
-rw-r--r-- | src/gallium/Makefile.am | 5 | ||||
-rw-r--r-- | src/gallium/targets/d3dadapter9/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/dri/Android.mk | 5 | ||||
-rw-r--r-- | src/gallium/targets/dri/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 14 | ||||
-rw-r--r-- | src/gallium/targets/xa/Makefile.am | 2 |
7 files changed, 0 insertions, 35 deletions
diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk index 2b469b65ee4..e67cfab5b31 100644 --- a/src/gallium/Android.mk +++ b/src/gallium/Android.mk @@ -48,11 +48,6 @@ ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),) SUBDIRS += winsys/i915/drm drivers/i915 endif -# ilo -ifneq ($(filter ilo, $(MESA_GPU_DRIVERS)),) -SUBDIRS += winsys/intel/drm drivers/ilo -endif - # nouveau ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),) SUBDIRS += \ diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index f910f3187eb..38da63b0690 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -27,11 +27,6 @@ if HAVE_GALLIUM_I915 SUBDIRS += drivers/i915 winsys/i915/drm endif -## ilo/i965 -if HAVE_GALLIUM_ILO -SUBDIRS += drivers/ilo winsys/intel/drm -endif - ## nouveau if HAVE_GALLIUM_NOUVEAU SUBDIRS += drivers/nouveau winsys/nouveau/drm diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am index b78fb721a1b..7a783f43716 100644 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ b/src/gallium/targets/d3dadapter9/Makefile.am @@ -85,8 +85,6 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc -include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc - include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 950a46420c5..dec8f055410 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -53,11 +53,6 @@ gallium_DRIVERS += libmesa_winsys_i915 libmesa_pipe_i915 LOCAL_SHARED_LIBRARIES += libdrm_intel LOCAL_CFLAGS += -DGALLIUM_I915 endif -ifneq ($(filter ilo,$(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_winsys_intel libmesa_pipe_ilo -LOCAL_SHARED_LIBRARIES += libdrm_intel -LOCAL_CFLAGS += -DGALLIUM_ILO -endif ifneq ($(filter nouveau,$(MESA_GPU_DRIVERS)),) gallium_DRIVERS += libmesa_winsys_nouveau libmesa_pipe_nouveau LOCAL_CFLAGS += -DGALLIUM_NOUVEAU diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index bca747faa4a..50c273376f6 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -75,8 +75,6 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc -include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc - include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc include $(top_srcdir)/src/gallium/drivers/r300/Automake.inc diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 7bcf9905d80..f805c4be2a9 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -90,20 +90,6 @@ pipe_i915_la_LIBADD = \ endif -if HAVE_GALLIUM_ILO -pipe_LTLIBRARIES += pipe_i965.la - -pipe_i965_la_SOURCES = pipe_i965.c -nodist_EXTRA_pipe_i965_la_SOURCES = dummy.cpp -pipe_i965_la_LIBADD = \ - $(PIPE_LIBS) \ - $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ - $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ - $(LIBDRM_LIBS) \ - $(INTEL_LIBS) - -endif - if HAVE_GALLIUM_NOUVEAU pipe_LTLIBRARIES += pipe_nouveau.la diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index cd065fc11c7..83a05230ff8 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -64,8 +64,6 @@ TARGET_LIB_DEPS = include $(top_srcdir)/src/gallium/drivers/i915/Automake.inc -include $(top_srcdir)/src/gallium/drivers/ilo/Automake.inc - include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc include $(top_srcdir)/src/gallium/drivers/svga/Automake.inc |