state_trackers/vega: Convert to automake

diff --git a/configure.ac b/configure.ac
index 7c2b2c0f4a695e6ee9865c5bb9a9bd2506db39dd..c0e599b8b912f7e24d0b27a5df3e1ac9a88ca257 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2049,6 +2049,7 @@ AC_CONFIG_FILES([configs/current
                src/gallium/state_trackers/gbm/Makefile
                src/gallium/state_trackers/glx/Makefile
                src/gallium/state_trackers/vdpau/Makefile
+               src/gallium/state_trackers/vega/Makefile
                src/gallium/targets/Makefile
                src/gallium/targets/opencl/Makefile
                src/gallium/winsys/Makefile

diff --git a/src/gallium/state_trackers/vega/.gitignore b/src/gallium/state_trackers/vega/.gitignore
index c452229f7f4b6139dfc9b43dce125fefe624bff9..dcd83d0a02fee4e26726e57758c723be936af5ad 100644 (file)
--- a/src/gallium/state_trackers/vega/.gitignore
+++ b/src/gallium/state_trackers/vega/.gitignore
@@ -1 +1,2 @@
 api_tmp.h
+Makefile

diff --git a/src/gallium/state_trackers/vega/Makefile b/src/gallium/state_trackers/vega/Makefile
deleted file mode 100644 (file)
index 3e8ad49..0000000
--- a/src/gallium/state_trackers/vega/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# src/gallium/state_trackers/vega/Makefile
-
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = vega
-
-LIBRARY_INCLUDES = \
-       -I$(TOP)/include \
-       -I$(TOP)/src/mapi
-
-LIBRARY_DEFINES = \
-       -DVEGA_VERSION_STRING=\"$(MESA_VERSION)\"
-
-C_SOURCES = \
-           api.c           \
-           api_context.c   \
-           api_filters.c   \
-           api_images.c    \
-           api_masks.c     \
-           api_misc.c      \
-           api_paint.c     \
-           api_params.c    \
-           api_path.c      \
-           api_text.c      \
-           api_transform.c \
-           arc.c \
-           bezier.c \
-           handle.c \
-           image.c \
-           mask.c \
-           paint.c \
-           path.c \
-           polygon.c \
-           renderer.c \
-           shader.c \
-           shaders_cache.c \
-           stroker.c \
-           text.c \
-           vg_context.c \
-           vg_manager.c \
-           vg_state.c \
-           vg_translate.c \
-           vgu.c
-
-
-GENERATED_SOURCES := api_tmp.h
-
-include ../../Makefile.template
-
-MAPI := $(TOP)/src/mapi
-api_tmp.h: $(MAPI)/mapi/mapi_abi.py $(MAPI)/vgapi/vgapi.csv
-       $(PYTHON2) $< --printer vgapi --mode app $(MAPI)/vgapi/vgapi.csv > $@

diff --git a/src/gallium/state_trackers/vega/Makefile.am b/src/gallium/state_trackers/vega/Makefile.am
new file mode 100644 (file)
index 0000000..f656af7
--- /dev/null
+++ b/src/gallium/state_trackers/vega/Makefile.am
@@ -0,0 +1,75 @@
+# 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_CFLAGS = $(GALLIUM_CFLAGS)
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/mapi \
+       -DVEGA_VERSION_STRING=\"$(MESA_VERSION)\"
+
+noinst_LTLIBRARIES = libvega.la
+
+libvega_la_SOURCES =   \
+       api.c           \
+       api_context.c   \
+       api_filters.c   \
+       api_images.c    \
+       api_masks.c     \
+       api_misc.c      \
+       api_paint.c     \
+       api_params.c    \
+       api_path.c      \
+       api_text.c      \
+       api_transform.c \
+       arc.c           \
+       bezier.c        \
+       handle.c        \
+       image.c         \
+       mask.c          \
+       paint.c         \
+       path.c          \
+       polygon.c       \
+       renderer.c      \
+       shader.c        \
+       shaders_cache.c \
+       stroker.c       \
+       text.c          \
+       vg_context.c    \
+       vg_manager.c    \
+       vg_state.c      \
+       vg_translate.c  \
+       vgu.c
+
+BUILT_SOURCES = api_tmp.h
+CLEANFILES = api_tmp.h
+
+api_tmp.h: $(top_srcdir)/src/mapi/vgapi/vgapi.csv $(top_srcdir)/src/mapi/mapi/mapi_abi.py
+       $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi/mapi_abi.py \
+                       --printer vgapi --mode app $< > $@
+
+#XXX: Delete this when all targets that rely on vega are converted to automake.
+all-local: libvega.la
+       ln -f $(builddir)/.libs/libvega.a $(builddir)/libvega.a
+
+CLEANFILES += libvega.a