[Mesa-dev] [PATCH 3/4] identity: Use non-recursive automake

[Tom Stellard]

---
 configure.ac                          |    4 ++++
 src/gallium/drivers/Makefile.am       |   14 ++++++++++++++
 src/gallium/drivers/identity/Makefile |   14 --------------
 3 files changed, 18 insertions(+), 14 deletions(-)
 delete mode 100644 src/gallium/drivers/identity/Makefile

diff --git a/configure.ac b/configure.ac
index fd6c877..452fbd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1941,6 +1941,9 @@ for driver in $GALLIUM_DRIVERS_DIRS; do
         xgalahad)
             HAVE_GALAHAD_GALLIUM=yes;
 	    ;;
+	xidentity)
+	    HAVE_IDENTITY_GALLIUM=yes;
+	    ;;
         *)
             GALLIUM_MAKE_DIRS="$GALLIUM_MAKE_DIRS $driver"
 	    ;;
@@ -1948,6 +1951,7 @@ for driver in $GALLIUM_DRIVERS_DIRS; do
 done
 
 AM_CONDITIONAL(HAVE_GALAHAD_GALLIUM, test x$HAVE_GALAHAD_GALLIUM = xyes)
+AM_CONDITIONAL(HAVE_IDENTITY_GALLIUM, test x$HAVE_IDENTITY_GALLIUM = xyes)
 AC_SUBST([GALLIUM_MAKE_DIRS])
 
 dnl prepend CORE_DIRS to SRC_DIRS
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index 6a0a247..f2e7da1 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -25,7 +25,21 @@ endif
 
 ################################################################################
 
+if HAVE_IDENTITY_GALLIUM
+
+noinst_LIBRARIES+= identity/libidentity.a
+
+identity_libidentity_a_SOURCES = \
+	identity/id_objects.c \
+	identity/id_context.c \
+	identity/id_screen.c
+
+endif
+
+################################################################################
+
 SUBDIRS = $(GALLIUM_MAKE_DIRS)
 
 # FIXME: Remove when the rest of Gallium is converted to automake.
 default: all
+
diff --git a/src/gallium/drivers/identity/Makefile b/src/gallium/drivers/identity/Makefile
deleted file mode 100644
index a15e17e..0000000
--- a/src/gallium/drivers/identity/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = identity
-
-C_SOURCES = \
-	id_objects.c \
-	id_context.c \
-	id_screen.c
-
-include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default
-- 
1.7.3.4