noop: Use non-recursive automake

diff --git a/configure.ac b/configure.ac
index 452fbd515ee7ff091f9185abdfe1a841b67208de..c0d81c9a4dee3afe2af531edb469e28df0cc65b2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1944,6 +1944,9 @@ for driver in $GALLIUM_DRIVERS_DIRS; do
        xidentity)
            HAVE_IDENTITY_GALLIUM=yes;
            ;;
+       xnoop)
+           HAVE_NOOP_GALLIUM=yes;
+           ;;
         *)
             GALLIUM_MAKE_DIRS="$GALLIUM_MAKE_DIRS $driver"
            ;;
@@ -1952,6 +1955,7 @@ done
 
 AM_CONDITIONAL(HAVE_GALAHAD_GALLIUM, test x$HAVE_GALAHAD_GALLIUM = xyes)
 AM_CONDITIONAL(HAVE_IDENTITY_GALLIUM, test x$HAVE_IDENTITY_GALLIUM = xyes)
+AM_CONDITIONAL(HAVE_NOOP_GALLIUM, test x$HAVE_NOOP_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 f2e7da110f9cc49c3594e7254c6d6508599e913d..0aa2653a0f199075822adf0ff3013ce4c6ba0f7e 100644 (file)
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -38,6 +38,20 @@ endif
 
 ################################################################################
 
+if HAVE_NOOP_GALLIUM
+
+# Meta-driver which combines whichever software rasterizers have been
+# built into a single convenience library.
+
+noinst_LIBRARIES+= noop/libnoop.a
+
+noop_libnoop_a_SOURCES = \
+       noop/noop_pipe.c \
+       noop/noop_state.c
+
+endif
+
+################################################################################
 SUBDIRS = $(GALLIUM_MAKE_DIRS)
 
 # FIXME: Remove when the rest of Gallium is converted to automake.

diff --git a/src/gallium/drivers/noop/Makefile b/src/gallium/drivers/noop/Makefile
deleted file mode 100644 (file)
index 75e65ed..0000000
--- a/src/gallium/drivers/noop/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Meta-driver which combines whichever software rasterizers have been
-# built into a single convenience library.
-
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = noop
-
-C_SOURCES = \
-       noop_pipe.c \
-       noop_state.c
-
-include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default