From: Aaron Watry <awatry@gmail.com>
Date: Wed, 13 Jun 2012 01:16:37 +0000 (-0500)
Subject: rbug: fix make process on Linux Mint 13 x64.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc3bac8a407dc2a2804236e1e2b813a3991fa84f;p=mesa.git

rbug: fix make process on Linux Mint 13 x64.

Previously, rbug_*.c would fail to compile with incomplete prototype
errors when make was run from the command line on my machine. My IDE
always built fine, and still does after this patch (Netbeans 7.1.2).

Most of the includes from files in gallium/auxiliary/rbug/* were
assuming an rbug/ subdirectory, while the headers are actually in the
same directory as the .c files.

The build error was also previously a problem for me on Ubuntu 11.10
and Mint 12.

Fixes build for the following configuration: ./autogen.sh
--enable-debug --enable-texture-float --with-gallium-drivers=r600
--with-dri-drivers=radeon --enable-r600-llvm-compiler

Signed-off-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/gallium/auxiliary/rbug/rbug.h b/src/gallium/auxiliary/rbug/rbug.h
index 259bfc6c79c..6b03ddebc87 100644
--- a/src/gallium/auxiliary/rbug/rbug.h
+++ b/src/gallium/auxiliary/rbug/rbug.h
@@ -26,8 +26,8 @@
  * Include all for users the remote debugger protocol code.
  */
 
-#include "rbug/rbug_core.h"
-#include "rbug/rbug_shader.h"
-#include "rbug/rbug_context.h"
-#include "rbug/rbug_texture.h"
-#include "rbug/rbug_connection.h"
+#include "rbug_core.h"
+#include "rbug_shader.h"
+#include "rbug_context.h"
+#include "rbug_texture.h"
+#include "rbug_connection.h"
diff --git a/src/gallium/auxiliary/rbug/rbug_connection.c b/src/gallium/auxiliary/rbug/rbug_connection.c
index ae4e27f9f6b..1c578d07842 100644
--- a/src/gallium/auxiliary/rbug/rbug_connection.c
+++ b/src/gallium/auxiliary/rbug/rbug_connection.c
@@ -22,8 +22,8 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "rbug/rbug.h"
-#include "rbug/rbug_internal.h"
+#include "rbug.h"
+#include "rbug_internal.h"
 
 #include "util/u_network.h"
 
diff --git a/src/gallium/auxiliary/rbug/rbug_connection.h b/src/gallium/auxiliary/rbug/rbug_connection.h
index 1f2c9ff347c..ea0ff14a625 100644
--- a/src/gallium/auxiliary/rbug/rbug_connection.h
+++ b/src/gallium/auxiliary/rbug/rbug_connection.h
@@ -30,7 +30,7 @@
 #ifndef _RBUG_CONNECTION_H_
 #define _RBUG_CONNECTION_H_
 
-#include "rbug/rbug_proto.h"
+#include "rbug_proto.h"
 
 struct rbug_connection * rbug_from_socket(int socket);
 
diff --git a/src/gallium/auxiliary/rbug/rbug_context.c b/src/gallium/auxiliary/rbug/rbug_context.c
index 1188dd966e4..cff5cfdaca9 100644
--- a/src/gallium/auxiliary/rbug/rbug_context.c
+++ b/src/gallium/auxiliary/rbug/rbug_context.c
@@ -35,7 +35,7 @@
  */
 
 #include "rbug_internal.h"
-#include "rbug/rbug_context.h"
+#include "rbug_context.h"
 
 int rbug_send_context_list(struct rbug_connection *__con,
                            uint32_t *__serial)
diff --git a/src/gallium/auxiliary/rbug/rbug_context.h b/src/gallium/auxiliary/rbug/rbug_context.h
index 4a865c25fc5..573507804fa 100644
--- a/src/gallium/auxiliary/rbug/rbug_context.h
+++ b/src/gallium/auxiliary/rbug/rbug_context.h
@@ -38,8 +38,8 @@
 #ifndef _RBUG_PROTO_CONTEXT_H_
 #define _RBUG_PROTO_CONTEXT_H_
 
-#include "rbug/rbug_proto.h"
-#include "rbug/rbug_core.h"
+#include "rbug_proto.h"
+#include "rbug_core.h"
 
 typedef enum
 {
diff --git a/src/gallium/auxiliary/rbug/rbug_core.c b/src/gallium/auxiliary/rbug/rbug_core.c
index 514a10932bc..767dd38ee86 100644
--- a/src/gallium/auxiliary/rbug/rbug_core.c
+++ b/src/gallium/auxiliary/rbug/rbug_core.c
@@ -35,7 +35,7 @@
  */
 
 #include "rbug_internal.h"
-#include "rbug/rbug_core.h"
+#include "rbug_core.h"
 
 int rbug_send_noop(struct rbug_connection *__con,
                    uint32_t *__serial)
diff --git a/src/gallium/auxiliary/rbug/rbug_core.h b/src/gallium/auxiliary/rbug/rbug_core.h
index 99a36a0163e..7cd36e4f87f 100644
--- a/src/gallium/auxiliary/rbug/rbug_core.h
+++ b/src/gallium/auxiliary/rbug/rbug_core.h
@@ -38,7 +38,7 @@
 #ifndef _RBUG_PROTO_CORE_H_
 #define _RBUG_PROTO_CORE_H_
 
-#include "rbug/rbug_proto.h"
+#include "rbug_proto.h"
 
 typedef uint64_t rbug_shader_t;
 typedef uint64_t rbug_context_t;
diff --git a/src/gallium/auxiliary/rbug/rbug_internal.h b/src/gallium/auxiliary/rbug/rbug_internal.h
index 4aba1a810f6..3a4cbc19240 100644
--- a/src/gallium/auxiliary/rbug/rbug_internal.h
+++ b/src/gallium/auxiliary/rbug/rbug_internal.h
@@ -30,7 +30,7 @@
 #ifndef _RBUG_INTERNAL_H_
 #define _RBUG_INTERNAL_H_
 
-#include "rbug/rbug_proto.h"
+#include "rbug_proto.h"
 
 #include "util/u_memory.h"
 #include "util/u_debug.h"
diff --git a/src/gallium/auxiliary/rbug/rbug_shader.c b/src/gallium/auxiliary/rbug/rbug_shader.c
index 1742941cc17..7765f761461 100644
--- a/src/gallium/auxiliary/rbug/rbug_shader.c
+++ b/src/gallium/auxiliary/rbug/rbug_shader.c
@@ -35,7 +35,7 @@
  */
 
 #include "rbug_internal.h"
-#include "rbug/rbug_shader.h"
+#include "rbug_shader.h"
 
 int rbug_send_shader_list(struct rbug_connection *__con,
                           rbug_context_t context,
diff --git a/src/gallium/auxiliary/rbug/rbug_shader.h b/src/gallium/auxiliary/rbug/rbug_shader.h
index b5d886781d8..9352e0cac7f 100644
--- a/src/gallium/auxiliary/rbug/rbug_shader.h
+++ b/src/gallium/auxiliary/rbug/rbug_shader.h
@@ -38,8 +38,8 @@
 #ifndef _RBUG_PROTO_SHADER_H_
 #define _RBUG_PROTO_SHADER_H_
 
-#include "rbug/rbug_proto.h"
-#include "rbug/rbug_core.h"
+#include "rbug_proto.h"
+#include "rbug_core.h"
 
 struct rbug_proto_shader_list
 {
diff --git a/src/gallium/auxiliary/rbug/rbug_texture.c b/src/gallium/auxiliary/rbug/rbug_texture.c
index 017c8d0b99b..ca051473504 100644
--- a/src/gallium/auxiliary/rbug/rbug_texture.c
+++ b/src/gallium/auxiliary/rbug/rbug_texture.c
@@ -35,7 +35,7 @@
  */
 
 #include "rbug_internal.h"
-#include "rbug/rbug_texture.h"
+#include "rbug_texture.h"
 
 int rbug_send_texture_list(struct rbug_connection *__con,
                            uint32_t *__serial)
diff --git a/src/gallium/auxiliary/rbug/rbug_texture.h b/src/gallium/auxiliary/rbug/rbug_texture.h
index fbb247e1d4f..59c914053ad 100644
--- a/src/gallium/auxiliary/rbug/rbug_texture.h
+++ b/src/gallium/auxiliary/rbug/rbug_texture.h
@@ -38,8 +38,8 @@
 #ifndef _RBUG_PROTO_TEXTURE_H_
 #define _RBUG_PROTO_TEXTURE_H_
 
-#include "rbug/rbug_proto.h"
-#include "rbug/rbug_core.h"
+#include "rbug_proto.h"
+#include "rbug_core.h"
 
 struct rbug_proto_texture_list
 {