2 files changed, 28 insertions, 15 deletions
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index b6954e2d94a..6a0a2472c16 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -1,4 +1,31 @@
-SUBDIRS = $(GALLIUM_DRIVERS_DIRS)
+AUTOMAKE_OPTIONS = subdir-objects
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/gallium/include \
+	-I$(top_srcdir)/src/gallium/auxiliary \
+	-I$(top_srcdir)/src/gallium/drivers \
+	$(DEFINES) \
+	$(ASM_FLAGS) \
+	$(PIC_FLAGS)
+
+noinst_LIBRARIES =
+
+################################################################################
+
+if HAVE_GALAHAD_GALLIUM
+
+noinst_LIBRARIES+= galahad/libgalahad.a
+
+galahad_libgalahad_a_SOURCES = \
+	galahad/glhd_objects.c \
+	galahad/glhd_context.c \
+	galahad/glhd_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/galahad/Makefile b/src/gallium/drivers/galahad/Makefile
deleted file mode 100644
index 15ea136a819..00000000000
--- a/src/gallium/drivers/galahad/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = galahad
-
-C_SOURCES = \
-	glhd_objects.c \
-	glhd_context.c \
-	glhd_screen.c
-
-include ../../Makefile.template
-
-# FIXME: Remove when this driver is converted to automake.
-all: default