summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-09-04 15:17:11 -0700
committerAndreas Boll <[email protected]>2013-01-10 22:01:09 +0100
commit2ad26034670dd1a1698e332a0c70f4127b1d44f5 (patch)
tree380c7b64f69a9fa2f8d32efbf5481561d3150150 /src/gallium/state_trackers
parent68c0311996408c42e7b31aaddad01c4f4b0a7628 (diff)
state_trackers/xa: Convert to automake
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r--src/gallium/state_trackers/xa/.gitignore1
-rw-r--r--src/gallium/state_trackers/xa/Makefile64
-rw-r--r--src/gallium/state_trackers/xa/Makefile.am47
3 files changed, 48 insertions, 64 deletions
diff --git a/src/gallium/state_trackers/xa/.gitignore b/src/gallium/state_trackers/xa/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/state_trackers/xa/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/state_trackers/xa/Makefile b/src/gallium/state_trackers/xa/Makefile
deleted file mode 100644
index 2843d23e0b2..00000000000
--- a/src/gallium/state_trackers/xa/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-##### MACROS #####
-
-XA_CFLAGS = -Wall -pedantic
-
-XA_INCLUDES= -I$(TOP)/src/gallium/ \
- -I$(TOP)/src/gallium/auxiliary \
- -I$(TOP)/src/gallium/include \
- -I$(TOP)/src/gallium/winsys \
- -I$(TOP)/src/gallium/drivers
-
-XA_LIB = xatracker
-XA_LIB_NAME = lib$(XA_LIB).o
-XA_LIB_DEPS =
-
-COMMON_GALLIUM_SOURCES=
-
-SOURCES = \
- xa_tracker.c \
- xa_context.c \
- xa_renderer.c \
- xa_tgsi.c \
- xa_yuv.c \
- xa_composite.c
-OBJECTS = $(SOURCES:.c=.o)
-
-##### RULES #####
-
-.c.o:
- $(CC) -c $(XA_CFLAGS) $(CFLAGS) $(XA_INCLUDES) $<
-
-
-##### TARGETS #####
-
-default: $(XA_LIB_NAME)
-
-
-# Make the library
-$(XA_LIB_NAME): depend $(OBJECTS)
- $(CC) -Wl,-r -nostdlib -o $(XA_LIB_NAME) $(OBJECTS) $(CFLAGS)
-
-install: FORCE
-
-clean:
- -rm -f *.o *~
- -rm -f *.lo
- -rm -f *.la
- -rm -f *.pc
- -rm -rf .libs
- -rm -f depend depend.bak
-
-
-depend: $(SOURCES)
- @ echo "running $(MKDEP)"
- @ rm -f depend
- @ touch depend
- @ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(XA_INCLUDES) $(SOURCES) \
- > /dev/null
-
--include depend
-
-FORCE:
diff --git a/src/gallium/state_trackers/xa/Makefile.am b/src/gallium/state_trackers/xa/Makefile.am
new file mode 100644
index 00000000000..5b53ef96f14
--- /dev/null
+++ b/src/gallium/state_trackers/xa/Makefile.am
@@ -0,0 +1,47 @@
+# 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 = \
+ -Wall -pedantic \
+ $(GALLIUM_CFLAGS)
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gallium/ \
+ -I$(top_srcdir)/src/gallium/winsys \
+ -I$(top_srcdir)/src/gallium/drivers
+
+xa_includedir = $(includedir)
+xa_include_HEADERS = \
+ xa_composite.h \
+ xa_context.h \
+ xa_tracker.h
+
+noinst_LTLIBRARIES = libxatracker.la
+
+libxatracker_la_SOURCES = \
+ xa_tracker.c \
+ xa_context.c \
+ xa_renderer.c \
+ xa_tgsi.c \
+ xa_yuv.c \
+ xa_composite.c