fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

noop: Use non-recursive automake

Browse source
This commit is contained in:
Tom Stellard 2012-03-03 20:35:39 -05:00 • committed by Tom Stellard
parent 3f3f10f78c
commit dc382e5c35
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -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

14
src/gallium/drivers/Makefile.am
View file

@ -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.

16
src/gallium/drivers/noop/Makefile
View file

@ -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