gallium/drivers: Use automake to generate makefile

diff --git a/configure.ac b/configure.ac
index a2d906abb977429e96e307eb0aca104740bd3528..451573185991e88353e4cd78cc6f1b8c213db142 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1948,6 +1948,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
 
 dnl Substitute the config
 AC_CONFIG_FILES([configs/autoconf
+               src/gallium/drivers/Makefile
                src/gallium/drivers/r300/Makefile
                src/gbm/Makefile
                src/gbm/main/gbm.pc

diff --git a/src/gallium/drivers/.gitignore b/src/gallium/drivers/.gitignore
new file mode 100644 (file)
index 0000000..a963aad
--- /dev/null
+++ b/src/gallium/drivers/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+.deps/

diff --git a/src/gallium/drivers/Makefile b/src/gallium/drivers/Makefile
deleted file mode 100644 (file)
index 9fe9b2c..0000000
--- a/src/gallium/drivers/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src/gallium/drivers/Makefile
-TOP = ../../..
-include $(TOP)/configs/current
-
-SUBDIRS = $(GALLIUM_DRIVERS_DIRS)
-
-default install clean:
-       @for dir in $(SUBDIRS) ; do \
-               if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE) $@) || exit 1; \
-               fi \
-       done

diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
new file mode 100644 (file)
index 0000000..b6954e2
--- /dev/null
+++ b/src/gallium/drivers/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = $(GALLIUM_DRIVERS_DIRS)
+
+# FIXME: Remove when the rest of Gallium is converted to automake.
+default: all

diff --git a/src/gallium/drivers/galahad/Makefile b/src/gallium/drivers/galahad/Makefile
index e9c4f7e28c81167896980503b66ab0fb8e7d4390..15ea136a8199dac87aaa0c6e80771c74e31b1080 100644 (file)
--- a/src/gallium/drivers/galahad/Makefile
+++ b/src/gallium/drivers/galahad/Makefile
@@ -9,3 +9,6 @@ C_SOURCES = \
        glhd_screen.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/i915/Makefile b/src/gallium/drivers/i915/Makefile
index 0e5767848461b4981ddd791a4069ea089c37cc08..b7d8a1f1d4065c0b2057cd01d8bd3beb0f4735e5 100644 (file)
--- a/src/gallium/drivers/i915/Makefile
+++ b/src/gallium/drivers/i915/Makefile
@@ -7,3 +7,6 @@ LIBNAME = i915
 include Makefile.sources
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/identity/Makefile b/src/gallium/drivers/identity/Makefile
index 74692d976105a7ae8e0599e32bdd7760911c5505..a15e17e0d4ad89335979d32d1b7777f0375a42b4 100644 (file)
--- a/src/gallium/drivers/identity/Makefile
+++ b/src/gallium/drivers/identity/Makefile
@@ -9,3 +9,6 @@ C_SOURCES = \
        id_screen.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 1a4e93d7ce3830bc8e3c0171fc2e492a1e986137..8df891cd1b24c2e250c6fe474e8c261ba04eeb7b 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -62,6 +62,9 @@ CLEAN_EXTRA = *.o
 
 include ../../Makefile.template
 
+# FIXME: Remove when this driver is converted to automake.
+all: default
+
 PROGS_DEPS := ../../auxiliary/libgallium.a
 
 lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_pack.py ../../auxiliary/util/u_format.csv

diff --git a/src/gallium/drivers/noop/Makefile b/src/gallium/drivers/noop/Makefile
index 29b8d73de227e7ccad3c4499eebe472c15f09f94..75e65ed60f4a4e5eb749a2c03fc57c29151691db 100644 (file)
--- a/src/gallium/drivers/noop/Makefile
+++ b/src/gallium/drivers/noop/Makefile
@@ -11,3 +11,6 @@ C_SOURCES = \
        noop_state.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/nouveau/Makefile b/src/gallium/drivers/nouveau/Makefile
index d583324b021627e7dc9b5f17cd84f45f60bfacc2..cfb8831582ff0b19b5ecead2db9ff710d99aa408 100644 (file)
--- a/src/gallium/drivers/nouveau/Makefile
+++ b/src/gallium/drivers/nouveau/Makefile
@@ -14,3 +14,6 @@ LIBRARY_DEFINES += $(shell $(PKG_CONFIG) libdrm libdrm_nouveau --cflags-only-oth
 include Makefile.sources
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/nv50/Makefile b/src/gallium/drivers/nv50/Makefile
index 18e30b0a54f026c31f114e51c984a14337ee010e..2dd37eeace6287ceb33cd36882584ecff66c3175 100644 (file)
--- a/src/gallium/drivers/nv50/Makefile
+++ b/src/gallium/drivers/nv50/Makefile
@@ -10,3 +10,6 @@ LIBRARY_INCLUDES = \
        $(LIBDRM_CFLAGS)
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/nvc0/Makefile b/src/gallium/drivers/nvc0/Makefile
index c41262559cd1f481851b2b301a38ec39f8eae4d9..a60127fe2d59e0014b82f32961938ee130e470e2 100644 (file)
--- a/src/gallium/drivers/nvc0/Makefile
+++ b/src/gallium/drivers/nvc0/Makefile
@@ -10,3 +10,6 @@ LIBRARY_INCLUDES = \
        $(LIBDRM_CFLAGS)
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/nvfx/Makefile b/src/gallium/drivers/nvfx/Makefile
index 53292d6da12e6cd1ceb827f578426ea518244b55..9b6ed1cad6a5d68e9a6b2e0a0418380bf37c5c91 100644 (file)
--- a/src/gallium/drivers/nvfx/Makefile
+++ b/src/gallium/drivers/nvfx/Makefile
@@ -11,3 +11,6 @@ LIBRARY_INCLUDES = \
        -I$(TOP)/src/gallium/drivers/nouveau/include
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index 8ec47d77ec15632afdf3d4287ec08eae65ca78de..af352aa23e484ab75d6f29ed811a2e7a0ab0f293 100644 (file)
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -32,7 +32,3 @@ r300_compiler_tests_SOURCES = \
        $(testdir)/radeon_compiler_util_tests.c \
        $(testdir)/rc_test_helpers.c \
        $(testdir)/unit_test.c
-
-# FIXME: remove this when the rest of the gallium
-# build system is converted to automake.
-default: libr300.a

diff --git a/src/gallium/drivers/r600/Makefile b/src/gallium/drivers/r600/Makefile
index 62e760c78a5a1df2c8529ec65ab8df1f9fc79c2a..e15e2ff2667c2c2625412477fdd8fc95ae38ec39 100644 (file)
--- a/src/gallium/drivers/r600/Makefile
+++ b/src/gallium/drivers/r600/Makefile
@@ -12,3 +12,6 @@ LIBRARY_INCLUDES = -I$(TOP)/include
 include Makefile.sources
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/rbug/Makefile b/src/gallium/drivers/rbug/Makefile
index 64e172fe5c186e849aceb27b4a4b40d40fc88e60..a426727c83f72c434c84db7754777fccce6fbbe1 100644 (file)
--- a/src/gallium/drivers/rbug/Makefile
+++ b/src/gallium/drivers/rbug/Makefile
@@ -10,3 +10,6 @@ C_SOURCES = \
        rbug_screen.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/softpipe/Makefile b/src/gallium/drivers/softpipe/Makefile
index 27b5d991a75e14bd4aabb489cafcc6e1803bd074..bcafa3c7fcb0604da4ecdaf3865df95e2c344cf4 100644 (file)
--- a/src/gallium/drivers/softpipe/Makefile
+++ b/src/gallium/drivers/softpipe/Makefile
@@ -35,3 +35,6 @@ C_SOURCES = \
        sp_surface.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/svga/Makefile b/src/gallium/drivers/svga/Makefile
index 97f68f06f471ddceecb1d9aaf3b6dfe0979a034b..825f15b84cb26850e36ffd2bd99545334d9b24ca 100644 (file)
--- a/src/gallium/drivers/svga/Makefile
+++ b/src/gallium/drivers/svga/Makefile
@@ -17,3 +17,6 @@ LIBRARY_DEFINES = \
        -DHAVE_STDINT_H -DHAVE_SYS_TYPES_H
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default

diff --git a/src/gallium/drivers/trace/Makefile b/src/gallium/drivers/trace/Makefile
index 99e5fb81c2241a62019c65cb0b8438131041f5bf..c842be80594f74edcd5e2f8a574e127f842d78c3 100644 (file)
--- a/src/gallium/drivers/trace/Makefile
+++ b/src/gallium/drivers/trace/Makefile
@@ -11,3 +11,6 @@ C_SOURCES = \
        tr_texture.c
 
 include ../../Makefile.template
+
+# FIXME: Remove when this driver is converted to automake.
+all: default