diff options
| author | Tom Stellard <[email protected]> | 2012-03-03 20:35:39 -0500 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2012-03-14 10:25:59 -0400 |
| commit | dc382e5c35a6e91a323789327c9a1ba3bc9f8c72 (patch) | |
| tree | 52bca38e15bb1d64b7e7c33f3db288970c8ab25a | |
| parent | 3f3f10f78c4ae5baa3344a2424b687518510c2fc (diff) | |
noop: Use non-recursive automake
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/Makefile.am | 14 | ||||
| -rw-r--r-- | src/gallium/drivers/noop/Makefile | 16 |
3 files changed, 18 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 452fbd515ee..c0d81c9a4de 100644 --- 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 f2e7da110f9..0aa2653a0f1 100644 --- 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 index 75e65ed60f4..00000000000 --- 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 |