From 3f3f10f78c4ae5baa3344a2424b687518510c2fc Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 3 Mar 2012 20:14:00 -0500 Subject: identity: Use non-recursive automake --- src/gallium/drivers/Makefile.am | 14 ++++++++++++++ src/gallium/drivers/identity/Makefile | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 src/gallium/drivers/identity/Makefile (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am index 6a0a2472c16..f2e7da110f9 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 a15e17e0d4a..00000000000 --- 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 -- cgit v1.2.3