diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/sw/xlib/.gitignore | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/sw/xlib/Makefile | 17 | ||||
| -rw-r--r-- | src/gallium/winsys/sw/xlib/Makefile.am | 35 |
4 files changed, 37 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 71d01f892d3..3903fd4b1fa 100644 --- a/configure.ac +++ b/configure.ac @@ -2038,6 +2038,7 @@ AC_CONFIG_FILES([configs/current src/gallium/winsys/sw/null/Makefile src/gallium/winsys/sw/wayland/Makefile src/gallium/winsys/sw/wrapper/Makefile + src/gallium/winsys/sw/xlib/Makefile src/gbm/Makefile src/gbm/main/gbm.pc src/glsl/Makefile diff --git a/src/gallium/winsys/sw/xlib/.gitignore b/src/gallium/winsys/sw/xlib/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/winsys/sw/xlib/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/winsys/sw/xlib/Makefile b/src/gallium/winsys/sw/xlib/Makefile deleted file mode 100644 index c6693899281..00000000000 --- 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 00000000000..76dbea315c4 --- /dev/null +++ b/src/gallium/winsys/sw/xlib/Makefile.am @@ -0,0 +1,35 @@ +# 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) \ + $(X11_CFLAGS) + +noinst_LTLIBRARIES = libws_xlib.la + +libws_xlib_la_SOURCES = xlib_sw_winsys.c + +#XXX: Delete this when all targets using the ws_xlib winsys are converted to automake. +all-local: libws_xlib.la + ln -f $(builddir)/.libs/libws_xlib.a $(builddir)/libws_xlib.a |