identity: Use non-recursive automake

This commit is contained in:
Tom Stellard 2012-03-03 20:14:00 -05:00 committed by Tom Stellard
parent 26ab747284
commit 3f3f10f78c
3 changed files with 18 additions and 14 deletions

View File

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

View File

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

View File

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