---
configure.ac | 1 +
src/gallium/drivers/rbug/.gitignore | 1 +
src/gallium/drivers/rbug/Makefile | 12 ------------
src/gallium/drivers/rbug/Makefile.am | 21 +++++++++++++++++++++
4 files changed, 23 insertions(+), 12 deletions(-)
create mode 100644 src/gallium/drivers/rbug/.gitignore
delete mode 100644 src/gallium/drivers/rbug/Makefile
create mode 100644 src/gallium/drivers/rbug/Makefile.am
diff --git a/configure.ac b/configure.ac
index 992ceab..fbb6ca4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2022,6 +2022,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
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
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
index 0000000..9a58d3f
--- /dev/null
+++ b/src/gallium/drivers/rbug/Makefile.am
@@ -0,0 +1,21 @@
+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
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
