winsys/sw: Convert to automake

diff --git a/configure.ac b/configure.ac
index 7003ae6..0d4fbc0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2032,6 +2032,7 @@ AC_CONFIG_FILES([configs/current
                src/gallium/winsys/nouveau/drm/Makefile
                src/gallium/winsys/radeon/drm/Makefile
                src/gallium/winsys/svga/drm/Makefile
+               src/gallium/winsys/sw/Makefile
                src/gbm/Makefile
                src/gbm/main/gbm.pc
                src/glsl/Makefile

diff --git a/src/gallium/winsys/sw/.gitignore b/src/gallium/winsys/sw/.gitignore
new file mode 100644 (file)
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/winsys/sw/.gitignore
@@ -0,0 +1 @@
+Makefile

diff --git a/src/gallium/winsys/sw/Makefile b/src/gallium/winsys/sw/Makefile
deleted file mode 100644 (file)
index 2fad717..0000000
--- a/src/gallium/winsys/sw/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# src/gallium/winsys/sw/Makefile
-TOP = ../../../..
-include $(TOP)/configs/current
-
-SUBDIRS = null wrapper
-
-# TODO: this should go through a further indirection level
-# (i.e. EGL should set a variable that is checked here)
-ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
-SUBDIRS += xlib
-endif
-
-ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),)
-SUBDIRS += fbdev
-endif
-
-ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
-SUBDIRS += wayland
-endif
-
-default install clean:
-       @for dir in $(SUBDIRS) ; do \
-               if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE) $@) || exit 1; \
-               fi \
-       done

diff --git a/src/gallium/winsys/sw/Makefile.am b/src/gallium/winsys/sw/Makefile.am
new file mode 100644 (file)
index 0000000..ae8984c
--- /dev/null
+++ b/src/gallium/winsys/sw/Makefile.am
@@ -0,0 +1,37 @@
+# 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.
+
+SUBDIRS = null wrapper
+
+# TODO: this should go through a further indirection level
+# (i.e. EGL should set a variable that is checked here)
+if HAVE_EGL_PLATFORM_X11
+SUBDIRS += xlib
+endif
+
+if HAVE_EGL_PLATFORM_FBDEV
+SUBDIRS += fbdev
+endif
+
+if HAVE_EGL_PLATFORM_WAYLAND
+SUBDIRS += wayland
+endif