summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-08-29 15:46:57 -0700
committerAndreas Boll <[email protected]>2013-01-10 22:01:08 +0100
commit24c2fe94a2fe518616263ecf953372ca17395097 (patch)
tree41d241516ac515652dcd96e9a363665779b0a3c7 /src
parent1d0ef53e7bfa7579adc625b8b9330d1682a8d930 (diff)
winsys/sw/wrapper: Convert to automake
Diffstat (limited to 'src')
-rw-r--r--src/gallium/winsys/sw/wrapper/.gitignore1
-rw-r--r--src/gallium/winsys/sw/wrapper/Makefile12
-rw-r--r--src/gallium/winsys/sw/wrapper/Makefile.am34
3 files changed, 35 insertions, 12 deletions
diff --git a/src/gallium/winsys/sw/wrapper/.gitignore b/src/gallium/winsys/sw/wrapper/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /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 4771fbcf700..00000000000
--- 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 00000000000..14f43827819
--- /dev/null
+++ b/src/gallium/winsys/sw/wrapper/Makefile.am
@@ -0,0 +1,34 @@
+# 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.
+
+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