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 259bfc6c79cded596de29e7713fb1b5b7da6c0fc..6b03ddebc8781c42a930bd7febb382bd9c76ab0f 100644 (file)
--- 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 ae4e27f9f6b99dd6b3122aa4d1e781f610ae2e21..1c578d07842c7cdf5fd5e524e0e5c5ed8fe22fb2 100644 (file)
--- 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 1f2c9ff347c45d3f4d47bb780493a8c6cdee26c1..ea0ff14a625cc0c60cffc4956e7ffb366e46ff96 100644 (file)
--- 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 1188dd966e4664d7bf3240670362c90bbcd451f4..cff5cfdaca9146f7a2e205bf84819cb57d12b626 100644 (file)
--- 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 4a865c25fc55746c82a3841240ab373d68ac14e0..573507804fa3ff790561ab0b7275a93eb0ec9c4e 100644 (file)
--- 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 514a10932bc5bfc29354b06035f424ba6ecb0255..767dd38ee8689eb1b2c088bebf275eecc4601ff3 100644 (file)
--- 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 99a36a0163ed66bd34d46f5ffd349b242b86c006..7cd36e4f87fb727ada90dd30d05487507d34fcba 100644 (file)
--- 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 4aba1a810f685067c506e960e4da032d5f9e38c9..3a4cbc19240bf5217435569811e9cefd496fbd08 100644 (file)
--- 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 1742941cc177fb36a6cea6913f262f3a12123609..7765f761461388bf2d01a95e0a992cbb1958ee12 100644 (file)
--- 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 b5d886781d866d95e6e4e0dec61e1a5cac405405..9352e0cac7f16b308b675a23ea5d5a684b4dc056 100644 (file)
--- 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 017c8d0b99b947d8ffdc0a840315ba177d0e9832..ca051473504e3325d1b3085a2f96b511e859dc1a 100644 (file)
--- 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 fbb247e1d4f288676dc5e8fd43831d23ca1b1085..59c914053ada152ef778c307ab1eb09b6e3b33c5 100644 (file)
--- 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
 {