---
configure.ac | 1 +
src/gallium/winsys/sw/.gitignore | 1 +
src/gallium/winsys/sw/Makefile | 26 --------------------------
src/gallium/winsys/sw/Makefile.am | 15 +++++++++++++++
4 files changed, 17 insertions(+), 26 deletions(-)
create mode 100644 src/gallium/winsys/sw/.gitignore
delete mode 100644 src/gallium/winsys/sw/Makefile
create mode 100644 src/gallium/winsys/sw/Makefile.am
diff --git a/configure.ac b/configure.ac
index 1fb1321..5de7df8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2041,6 +2041,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
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
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
index 0000000..48b47ce
--- /dev/null
+++ b/src/gallium/winsys/sw/Makefile.am
@@ -0,0 +1,15 @@
+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
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
