From 1d0ef53e7bfa7579adc625b8b9330d1682a8d930 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 29 Aug 2012 15:44:25 -0700 Subject: [PATCH] winsys/sw/wayland: Convert to automake --- configure.ac | 1 + src/gallium/winsys/sw/wayland/.gitignore | 1 + src/gallium/winsys/sw/wayland/Makefile | 13 --------- src/gallium/winsys/sw/wayland/Makefile.am | 35 +++++++++++++++++++++++ 4 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 src/gallium/winsys/sw/wayland/.gitignore delete mode 100644 src/gallium/winsys/sw/wayland/Makefile create mode 100644 src/gallium/winsys/sw/wayland/Makefile.am diff --git a/configure.ac b/configure.ac index 032b2157542..35814966d3a 100644 --- a/configure.ac +++ b/configure.ac @@ -2036,6 +2036,7 @@ AC_CONFIG_FILES([configs/current src/gallium/winsys/sw/dri/Makefile src/gallium/winsys/sw/fbdev/Makefile src/gallium/winsys/sw/null/Makefile + src/gallium/winsys/sw/wayland/Makefile src/gbm/Makefile src/gbm/main/gbm.pc src/glsl/Makefile diff --git a/src/gallium/winsys/sw/wayland/.gitignore b/src/gallium/winsys/sw/wayland/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/winsys/sw/wayland/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/winsys/sw/wayland/Makefile b/src/gallium/winsys/sw/wayland/Makefile deleted file mode 100644 index b3f2081686e..00000000000 --- a/src/gallium/winsys/sw/wayland/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -TOP = ../../../../.. -include $(TOP)/configs/current - -LIBNAME = ws_wayland - -LIBRARY_INCLUDES = $(WAYLAND_CFLAGS) - -LIBRARY_DEFINES = - -C_SOURCES = \ - wayland_sw_winsys.c - -include ../../../Makefile.template diff --git a/src/gallium/winsys/sw/wayland/Makefile.am b/src/gallium/winsys/sw/wayland/Makefile.am new file mode 100644 index 00000000000..8f20751faf2 --- /dev/null +++ b/src/gallium/winsys/sw/wayland/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) + $(WAYLAND_CFLAGS) + +noinst_LTLIBRARIES = libws_wayland.la + +libws_wayland_la_SOURCES = wayland_sw_winsys.c + +#XXX: Delete this when all targets using the ws_wayland winsys are converted to automake. +all-local: libws_wayland.la + ln -f $(builddir)/.libs/libws_wayland.a $(builddir)/libws_wayland.a -- 2.30.2