---
configure.ac | 1 +
src/gallium/winsys/sw/xlib/Makefile | 17 -----------------
src/gallium/winsys/sw/xlib/Makefile.am | 24 ++++++++++++++++++++++++
3 files changed, 25 insertions(+), 17 deletions(-)
delete mode 100644 src/gallium/winsys/sw/xlib/Makefile
create mode 100644 src/gallium/winsys/sw/xlib/Makefile.am
diff --git a/configure.ac b/configure.ac
index 4ace544..bf5330d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1973,6 +1973,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
dnl Substitute the config
AC_CONFIG_FILES([configs/autoconf
src/gallium/winsys/sw/null/Makefile
+ src/gallium/winsys/sw/xlib/Makefile
src/gallium/drivers/Makefile
src/gallium/drivers/r300/Makefile
src/gbm/Makefile
diff --git a/src/gallium/winsys/sw/xlib/Makefile
b/src/gallium/winsys/sw/xlib/Makefile
deleted file mode 100644
index c669389..0000000
--- a/src/gallium/winsys/sw/xlib/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = ws_xlib
-
-LIBRARY_INCLUDES = \
- -I$(TOP)/src/gallium/include \
- -I$(TOP)/src/gallium/drivers \
- -I$(TOP)/src/gallium/auxiliary \
- $(X11_CFLAGS)
-
-C_SOURCES = \
- xlib_sw_winsys.c
-
-include ../../../Makefile.template
-
-
diff --git a/src/gallium/winsys/sw/xlib/Makefile.am
b/src/gallium/winsys/sw/xlib/Makefile.am
new file mode 100644
index 0000000..b9a177c
--- /dev/null
+++ b/src/gallium/winsys/sw/xlib/Makefile.am
@@ -0,0 +1,24 @@
+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
+
+AM_CFLAGS = $(X11_CFLAGS)
+
+noinst_LTLIBRARIES = libws_xlib.la
+
+libws_xlib_la_SOURCES = \
+ xlib_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_xlib.a .
+
+clean-local:
+ rm -f libws_xlib.a
+
+# FIXME: Remove when the rest of Gallium is converted to automake.
+default: all
--
1.7.9.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
