3 files changed, 42 insertions, 50 deletions
diff --git a/src/gallium/state_trackers/gbm/.gitignore b/src/gallium/state_trackers/gbm/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/state_trackers/gbm/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/state_trackers/gbm/Makefile b/src/gallium/state_trackers/gbm/Makefile
deleted file mode 100644
index 2ebdbfa105e..00000000000
--- a/src/gallium/state_trackers/gbm/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-gbm_INCLUDES = \
-	-I. \
-	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/auxiliary \
-	-I$(TOP)/src/gbm/main \
-	-I$(TOP)/include
-
-gbm_SOURCES = $(wildcard *.c)
-gbm_OBJECTS = $(gbm_SOURCES:.c=.o)
-
-ALL_INCLUDES = $(gbm_INCLUDES)
-ALL_SOURCES = $(gbm_SOURCES)
-
-GBM_OBJECTS = $(gbm_OBJECTS)
-GBM_CPPFLAGS = $(gbm_INCLUDES)
-
-ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
-GBM_CPPFLAGS += -DHAVE_WAYLAND_PLATFORM
-endif
-
-##### TARGETS #####
-
-default: depend libgbm.a
-
-libgbm.a: $(GBM_OBJECTS) Makefile
-	$(MKLIB) -o gbm -static $(GBM_OBJECTS)
-
-depend: 
-	rm -f depend
-	touch depend
-	$(MKDEP) $(MKDEP_OPTIONS) $(ALL_INCLUDES) $(ALL_SOURCES) 2> /dev/null
-
-clean:
-	rm -f libgbm.a
-	rm -f $(GBM_OBJECTS)
-	rm -f depend depend.bak
-
-# Dummy target
-install:
-	@echo -n ""
-
-##### RULES #####
-
-$(gbm_OBJECTS): %.o: %.c
-	$(CC) -c $(GBM_CPPFLAGS) $(DEFINES) $(CFLAGS) $< -o $@
-
-sinclude depend
diff --git a/src/gallium/state_trackers/gbm/Makefile.am b/src/gallium/state_trackers/gbm/Makefile.am
new file mode 100644
index 00000000000..7caa840ed0d
--- /dev/null
+++ b/src/gallium/state_trackers/gbm/Makefile.am
@@ -0,0 +1,41 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = $(GALLIUM_CFLAGS)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/gbm/main \
+	-I$(top_srcdir)/include
+if HAVE_EGL_PLATFORM_WAYLAND
+AM_CPPFLAGS += -DHAVE_WAYLAND_PLATFORM
+endif
+
+noinst_LTLIBRARIES = libgbm.la
+
+libgbm_la_SOURCES = gbm_drm.c
+
+#XXX: Delete this when all targets that rely on gbm are converted to automake.
+all-local: libgbm.la
+	ln -f $(builddir)/.libs/libgbm.a $(builddir)/libgbm.a
+
+CLEANFILES = libgbm.a