[Mesa-dev] [PATCH 29/32] winsys/sw/xlib: Convert to automake

[Matt Turner]

---
 configure.ac                           |    1 +
 src/gallium/winsys/sw/xlib/.gitignore  |    1 +
 src/gallium/winsys/sw/xlib/Makefile    |   17 -----------------
 src/gallium/winsys/sw/xlib/Makefile.am |   13 +++++++++++++
 4 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 src/gallium/winsys/sw/xlib/.gitignore
 delete mode 100644 src/gallium/winsys/sw/xlib/Makefile
 create mode 100644 src/gallium/winsys/sw/xlib/Makefile.am

diff --git a/configure.ac b/configure.ac
index 083bcb5..e655724 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2047,6 +2047,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/winsys/sw/null/Makefile
 		src/gallium/winsys/sw/wayland/Makefile
 		src/gallium/winsys/sw/wrapper/Makefile
+		src/gallium/winsys/sw/xlib/Makefile
 		src/gbm/Makefile
 		src/gbm/main/gbm.pc
 		src/glsl/Makefile
diff --git a/src/gallium/winsys/sw/xlib/.gitignore b/src/gallium/winsys/sw/xlib/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/winsys/sw/xlib/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/sw/xlib/Makefile b/src/gallium/winsys/sw/xlib/Makefile
deleted file mode 100644
index c669389..0000000
--- a/src/gallium/winsys/sw/xlib/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = ws_xlib
-
-LIBRARY_INCLUDES = \
-	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/drivers \
-	-I$(TOP)/src/gallium/auxiliary \
-	$(X11_CFLAGS)
-
-C_SOURCES = \
-	xlib_sw_winsys.c 
-
-include ../../../Makefile.template
-
-
diff --git a/src/gallium/winsys/sw/xlib/Makefile.am b/src/gallium/winsys/sw/xlib/Makefile.am
new file mode 100644
index 0000000..d4ef833
--- /dev/null
+++ b/src/gallium/winsys/sw/xlib/Makefile.am
@@ -0,0 +1,13 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+	$(GALLIUM_CFLAGS) \
+	$(X11_CFLAGS)
+
+noinst_LTLIBRARIES = libws_xlib.la
+
+libws_xlib_la_SOURCES = xlib_sw_winsys.c
+
+#XXX: Delete this when all targets using the ws_xlib winsys are converted to automake.
+all-local: libws_xlib.la
+	ln -f $(builddir)/.libs/libws_xlib.a $(builddir)/libws_xlib.a
-- 
1.7.8.6