---
configure.ac | 1 +
src/gallium/winsys/sw/wrapper/.gitignore | 1 +
src/gallium/winsys/sw/wrapper/Makefile | 12 ------------
src/gallium/winsys/sw/wrapper/Makefile.am | 12 ++++++++++++
4 files changed, 14 insertions(+), 12 deletions(-)
create mode 100644 src/gallium/winsys/sw/wrapper/.gitignore
delete mode 100644 src/gallium/winsys/sw/wrapper/Makefile
create mode 100644 src/gallium/winsys/sw/wrapper/Makefile.am
diff --git a/configure.ac b/configure.ac
index d3b30d8..083bcb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2046,6 +2046,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/winsys/sw/fbdev/Makefile
src/gallium/winsys/sw/null/Makefile
src/gallium/winsys/sw/wayland/Makefile
+ src/gallium/winsys/sw/wrapper/Makefile
src/gbm/Makefile
src/gbm/main/gbm.pc
src/glsl/Makefile
diff --git a/src/gallium/winsys/sw/wrapper/.gitignore
b/src/gallium/winsys/sw/wrapper/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/winsys/sw/wrapper/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/sw/wrapper/Makefile
b/src/gallium/winsys/sw/wrapper/Makefile
deleted file mode 100644
index 4771fbc..0000000
--- a/src/gallium/winsys/sw/wrapper/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = wsw
-
-C_SOURCES = wrapper_sw_winsys.c
-
-LIBRARY_INCLUDES =
-
-LIBRARY_DEFINES =
-
-include ../../../Makefile.template
diff --git a/src/gallium/winsys/sw/wrapper/Makefile.am
b/src/gallium/winsys/sw/wrapper/Makefile.am
new file mode 100644
index 0000000..0ba594a
--- /dev/null
+++ b/src/gallium/winsys/sw/wrapper/Makefile.am
@@ -0,0 +1,12 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+ $(GALLIUM_CFLAGS)
+
+noinst_LTLIBRARIES = libwsw.la
+
+libwsw_la_SOURCES = wrapper_sw_winsys.c
+
+#XXX: Delete this when all targets using the wsw winsys are converted to
automake.
+all-local: libwsw.la
+ ln -f $(builddir)/.libs/libwsw.a $(builddir)/libwsw.a
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
