4 files changed, 47 insertions, 44 deletions
diff --git a/src/gallium/state_trackers/glx/.gitignore b/src/gallium/state_trackers/glx/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/state_trackers/glx/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/state_trackers/glx/Makefile b/src/gallium/state_trackers/glx/Makefile
deleted file mode 100644
index f779035763e..00000000000
--- a/src/gallium/state_trackers/glx/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-
-SUBDIRS = xlib
-
-
-default: subdirs
-
-
-subdirs:
-	@for dir in $(SUBDIRS) ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE)) || exit 1 ; \
-		fi \
-	done
-
-
-clean:
-	rm -f `find . -name \*.[oa]`
-	rm -f `find . -name depend`
-
-
-# Dummy install target
-install:
diff --git a/src/gallium/state_trackers/glx/Makefile.am b/src/gallium/state_trackers/glx/Makefile.am
new file mode 100644
index 00000000000..2b16f914bf3
--- /dev/null
+++ b/src/gallium/state_trackers/glx/Makefile.am
@@ -0,0 +1,46 @@
+# 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) \
+	$(X11_CFLAGS)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/mapi \
+	-I$(top_srcdir)/src/mesa
+
+noinst_LTLIBRARIES = libxlib.la
+
+libxlib_la_SOURCES = \
+	xlib/glx_api.c \
+	xlib/glx_getproc.c \
+	xlib/glx_usefont.c \
+	xlib/xm_api.c \
+	xlib/xm_st.c
+
+#XXX: Delete this when all targets that rely on xlib are converted to automake.
+all-local: libxlib.la
+	ln -f $(builddir)/.libs/libxlib.a $(builddir)/xlib/libxlib.a
+
+CLEANFILES = libxlib.a
diff --git a/src/gallium/state_trackers/glx/xlib/Makefile b/src/gallium/state_trackers/glx/xlib/Makefile
deleted file mode 100644
index 84cb36ec367..00000000000
--- a/src/gallium/state_trackers/glx/xlib/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = xlib
-
-LIBRARY_INCLUDES = \
-	-I$(TOP)/include \
-	-I$(TOP)/src/mapi \
-	-I$(TOP)/src/mesa \
-	$(X11_CFLAGS)
-
-C_SOURCES = \
-	glx_api.c \
-	glx_getproc.c \
-	glx_usefont.c \
-	xm_api.c \
-	xm_st.c
-
-include ../../../Makefile.template