[Mesa-dev] [PATCH 10/15] winsys/sw/null: Convert to automake.

[Francisco Jerez]

---
 configure.ac                           |    1 +
 src/gallium/winsys/sw/null/Makefile    |   16 ----------------
 src/gallium/winsys/sw/null/Makefile.am |   23 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 16 deletions(-)
 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 fe5e198..4ace544 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1972,6 +1972,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
 
 dnl Substitute the config
 AC_CONFIG_FILES([configs/autoconf
+		src/gallium/winsys/sw/null/Makefile
 		src/gallium/drivers/Makefile
 		src/gallium/drivers/r300/Makefile
 		src/gbm/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..8981fb3
--- /dev/null
+++ b/src/gallium/winsys/sw/null/Makefile.am
@@ -0,0 +1,23 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
+AM_CPPFLAGS = $(DEFINES) \
+	-I$(top_srcdir)/src/gallium/include \
+	-I$(top_srcdir)/src/gallium/drivers \
+	-I$(top_srcdir)/src/gallium/auxiliary
+
+noinst_LTLIBRARIES = libws_null.la
+
+libws_null_la_SOURCES = \
+	null_sw_winsys.h \
+	null_sw_winsys.c
+
+# Provide compatibility with scripts for the old Mesa build system for
+# a while by putting a link to the library in the current directory.
+all-local:
+	ln -f .libs/libws_null.a .
+
+clean-local:
+	rm -f libws_null.a
+
+# FIXME: Remove when the rest of Gallium is converted to automake.
+default: all
-- 
1.7.9.2