[Mesa-dev] [PATCH 26/32] winsys/sw/null: Convert to automake

[Matt Turner]

---
 configure.ac                           |    1 +
 src/gallium/winsys/sw/null/.gitignore  |    1 +
 src/gallium/winsys/sw/null/Makefile    |   16 ----------------
 src/gallium/winsys/sw/null/Makefile.am |   12 ++++++++++++
 4 files changed, 14 insertions(+), 16 deletions(-)
 create mode 100644 src/gallium/winsys/sw/null/.gitignore
 delete mode 100644 src/gallium/winsys/sw/null/Makefile
 create mode 100644 src/gallium/winsys/sw/null/Makefile.am

diff --git a/configure.ac b/configure.ac
index 16fc497..b4d5ed8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2044,6 +2044,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/winsys/sw/Makefile
 		src/gallium/winsys/sw/dri/Makefile
 		src/gallium/winsys/sw/fbdev/Makefile
+		src/gallium/winsys/sw/null/Makefile
 		src/gbm/Makefile
 		src/gbm/main/gbm.pc
 		src/glsl/Makefile
diff --git a/src/gallium/winsys/sw/null/.gitignore b/src/gallium/winsys/sw/null/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/winsys/sw/null/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/sw/null/Makefile b/src/gallium/winsys/sw/null/Makefile
deleted file mode 100644
index b1882b5..0000000
--- a/src/gallium/winsys/sw/null/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = ws_null
-
-LIBRARY_INCLUDES = \
-	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/drivers \
-	-I$(TOP)/src/gallium/auxiliary
-
-C_SOURCES = \
-	null_sw_winsys.c 
-
-include ../../../Makefile.template
-
-
diff --git a/src/gallium/winsys/sw/null/Makefile.am b/src/gallium/winsys/sw/null/Makefile.am
new file mode 100644
index 0000000..fe91698
--- /dev/null
+++ b/src/gallium/winsys/sw/null/Makefile.am
@@ -0,0 +1,12 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+	$(GALLIUM_CFLAGS)
+
+noinst_LTLIBRARIES = libws_null.la
+
+libws_null_la_SOURCES = null_sw_winsys.c
+
+#XXX: Delete this when all targets using the ws_null winsys are converted to automake.
+all-local: libws_null.la
+	ln -f $(builddir)/.libs/libws_null.a $(builddir)/libws_null.a
-- 
1.7.8.6