rbug: Convert to automake

diff --git a/configure.ac b/configure.ac
index d77f771bcd607123e9e90c7c88268229f31895f1..5f84ac1ec529edf4f8917dc51b89b82d7e49ac38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2013,6 +2013,7 @@ AC_CONFIG_FILES([configs/current
                src/gallium/drivers/i915/Makefile
                src/gallium/drivers/r300/Makefile
                src/gallium/drivers/r600/Makefile
+               src/gallium/drivers/rbug/Makefile
                src/gallium/drivers/trace/Makefile
                src/gallium/state_trackers/clover/Makefile
                src/gallium/targets/Makefile

diff --git a/src/gallium/drivers/rbug/.gitignore b/src/gallium/drivers/rbug/.gitignore
new file mode 100644 (file)
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/drivers/rbug/.gitignore
@@ -0,0 +1 @@
+Makefile

diff --git a/src/gallium/drivers/rbug/Makefile b/src/gallium/drivers/rbug/Makefile
deleted file mode 100644 (file)
index 64e172f..0000000
--- a/src/gallium/drivers/rbug/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = rbug
-
-C_SOURCES = \
-       rbug_core.c \
-       rbug_context.c \
-       rbug_objects.c \
-       rbug_screen.c
-
-include ../../Makefile.template

diff --git a/src/gallium/drivers/rbug/Makefile.am b/src/gallium/drivers/rbug/Makefile.am
new file mode 100644 (file)
index 0000000..43b5d6e
--- /dev/null
+++ b/src/gallium/drivers/rbug/Makefile.am
@@ -0,0 +1,43 @@
+# 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
+
+noinst_LTLIBRARIES = librbug.la
+
+# GALLIUM_CFLAGS must appear before src/gallium/drivers
+# because there are stupidly two rbug_context.h files in
+# different directories, and which one is included by the
+# preprocessor is determined by the ordering of the -I flags.
+AM_CFLAGS = \
+       $(GALLIUM_CFLAGS) \
+       -I$(top_srcdir)/src/gallium/drivers \
+       -I$(top_srcdir)/include
+
+librbug_la_SOURCES = \
+       rbug_core.c \
+       rbug_context.c \
+       rbug_objects.c \
+       rbug_screen.c
+
+all-local: librbug.la
+       ln -f $(builddir)/.libs/librbug.a $(builddir)/librbug.a