GUACAMOLE-637: Use proper namespaced path for Guacamole headers within libguac source.

src/libguac/Makefile.am

@@ -122,7 +122,7 @@ libguacinc_HEADERS += guacamole/socket-wsa.h
 endif
 
 libguac_la_CFLAGS = \
-    -Werror -Wall -pedantic -I$(srcdir)/guacamole
+    -Werror -Wall -pedantic
 
 libguac_la_LDFLAGS =     \
     -version-info 16:0:0 \

src/libguac/audio.c

@@ -19,14 +19,13 @@
 
 #include "config.h"
 
+#include "guacamole/audio.h"
+#include "guacamole/client.h"
+#include "guacamole/protocol.h"
+#include "guacamole/stream.h"
+#include "guacamole/user.h"
 #include "raw_encoder.h"
 
-#include <guacamole/audio.h>
-#include <guacamole/client.h>
-#include <guacamole/protocol.h>
-#include <guacamole/stream.h>
-#include <guacamole/user.h>
-
 #include <stdlib.h>
 #include <string.h>
 

src/libguac/client.c

@@ -19,20 +19,20 @@
 
 #include "config.h"
 
-#include "client.h"
 #include "encode-jpeg.h"
 #include "encode-png.h"
 #include "encode-webp.h"
-#include "error.h"
+#include "guacamole/client.h"
+#include "guacamole/error.h"
+#include "guacamole/layer.h"
+#include "guacamole/plugin.h"
+#include "guacamole/pool.h"
+#include "guacamole/protocol.h"
+#include "guacamole/socket.h"
+#include "guacamole/stream.h"
+#include "guacamole/timestamp.h"
+#include "guacamole/user.h"
 #include "id.h"
-#include "layer.h"
-#include "pool.h"
-#include "plugin.h"
-#include "protocol.h"
-#include "socket.h"
-#include "stream.h"
-#include "timestamp.h"
-#include "user.h"
 
 #include <dlfcn.h>
 #include <inttypes.h>

src/libguac/encode-jpeg.c

@@ -20,10 +20,10 @@
 #include "config.h"
 
 #include "encode-jpeg.h"
-#include "error.h"
+#include "guacamole/error.h"
+#include "guacamole/protocol.h"
+#include "guacamole/stream.h"
 #include "palette.h"
-#include "protocol.h"
-#include "stream.h"
 
 #include <cairo/cairo.h>
 #include <jpeglib.h>

src/libguac/encode-jpeg.h

@@ -22,8 +22,8 @@
 
 #include "config.h"
 
-#include "socket.h"
+#include "guacamole/socket.h"
-#include "stream.h"
+#include "guacamole/stream.h"
 
 #include <cairo/cairo.h>
 

src/libguac/encode-png.c

@@ -20,10 +20,10 @@
 #include "config.h"
 
 #include "encode-png.h"
-#include "error.h"
+#include "guacamole/error.h"
+#include "guacamole/protocol.h"
+#include "guacamole/stream.h"
 #include "palette.h"
-#include "protocol.h"
-#include "stream.h"
 
 #include <png.h>
 #include <cairo/cairo.h>

src/libguac/encode-png.h

@@ -22,8 +22,8 @@
 
 #include "config.h"
 
-#include "socket.h"
+#include "guacamole/socket.h"
-#include "stream.h"
+#include "guacamole/stream.h"
 
 #include <cairo/cairo.h>
 

src/libguac/encode-webp.c

@@ -20,10 +20,10 @@
 #include "config.h"
 
 #include "encode-webp.h"
-#include "error.h"
+#include "guacamole/error.h"
+#include "guacamole/protocol.h"
+#include "guacamole/stream.h"
 #include "palette.h"
-#include "protocol.h"
-#include "stream.h"
 
 #include <cairo/cairo.h>
 #include <webp/encode.h>

src/libguac/encode-webp.h

@@ -22,8 +22,8 @@
 
 #include "config.h"
 
-#include "socket.h"
+#include "guacamole/socket.h"
-#include "stream.h"
+#include "guacamole/stream.h"
 
 #include <cairo/cairo.h>
 

src/libguac/error.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "error.h"
+#include "guacamole/error.h"
 
 #include <errno.h>
 #include <stdlib.h>

src/libguac/id.c

@@ -19,8 +19,8 @@
 
 #include "config.h"
 
+#include "guacamole/error.h"
 #include "id.h"
-#include "error.h"
 
 #ifdef HAVE_OSSP_UUID_H
 #include <ossp/uuid.h>

src/libguac/parser.c

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include "error.h"
+#include "guacamole/error.h"
-#include "parser.h"
+#include "guacamole/parser.h"
-#include "socket.h"
+#include "guacamole/socket.h"
-#include "unicode.h"
+#include "guacamole/unicode.h"
 
 #include <stdlib.h>
 #include <stdio.h>

src/libguac/pool.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "pool.h"
+#include "guacamole/pool.h"
 
 #include <stdlib.h>
 

src/libguac/protocol.c

@@ -19,14 +19,14 @@
 
 #include "config.h"
 
-#include "error.h"
+#include "guacamole/error.h"
-#include "layer.h"
+#include "guacamole/layer.h"
-#include "object.h"
+#include "guacamole/object.h"
+#include "guacamole/protocol.h"
+#include "guacamole/socket.h"
+#include "guacamole/stream.h"
+#include "guacamole/unicode.h"
 #include "palette.h"
-#include "protocol.h"
-#include "socket.h"
-#include "stream.h"
-#include "unicode.h"
 
 #include <cairo/cairo.h>
 

src/libguac/raw_encoder.c

@@ -19,15 +19,13 @@
 
 #include "config.h"
 
-#include "audio.h"
+#include "guacamole/audio.h"
+#include "guacamole/client.h"
+#include "guacamole/protocol.h"
+#include "guacamole/socket.h"
+#include "guacamole/user.h"
 #include "raw_encoder.h"
 
-#include <guacamole/audio.h>
-#include <guacamole/client.h>
-#include <guacamole/protocol.h>
-#include <guacamole/socket.h>
-#include <guacamole/user.h>
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

src/libguac/raw_encoder.h

@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "audio.h"
+#include "guacamole/audio.h"
 
 /**
  * The number of bytes to send in each audio blob.

src/libguac/socket-broadcast.c

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include "client.h"
+#include "guacamole/client.h"
-#include "error.h"
+#include "guacamole/error.h"
-#include "socket.h"
+#include "guacamole/socket.h"
-#include "user.h"
+#include "guacamole/user.h"
 
 #include <pthread.h>
 #include <stdlib.h>

src/libguac/socket-fd.c

@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include "error.h"
+#include "guacamole/error.h"
-#include "socket.h"
+#include "guacamole/socket.h"
 #include "wait-fd.h"
 
 #include <pthread.h>

src/libguac/socket-nest.c

@@ -19,9 +19,9 @@
 
 #include "config.h"
 
-#include "protocol.h"
+#include "guacamole/protocol.h"
-#include "socket.h"
+#include "guacamole/socket.h"
-#include "unicode.h"
+#include "guacamole/unicode.h"
 
 #include <stddef.h>
 #include <stdlib.h>

src/libguac/socket-ssl.c

@@ -19,9 +19,9 @@
 
 #include "config.h"
 
-#include "error.h"
+#include "guacamole/error.h"
-#include "socket-ssl.h"
+#include "guacamole/socket-ssl.h"
-#include "socket.h"
+#include "guacamole/socket.h"
 #include "wait-fd.h"
 
 #include <stdlib.h>

src/libguac/socket-tee.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "socket.h"
+#include "guacamole/socket.h"
 
 #include <stdlib.h>
 

src/libguac/socket-wsa.c

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "error.h"
+#include "guacamole/error.h"
-#include "socket.h"
+#include "guacamole/socket.h"
 
 #include <pthread.h>
 #include <stddef.h>

src/libguac/socket.c

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include "error.h"
+#include "guacamole/error.h"
-#include "protocol.h"
+#include "guacamole/protocol.h"
-#include "socket.h"
+#include "guacamole/socket.h"
-#include "timestamp.h"
+#include "guacamole/timestamp.h"
 
 #include <inttypes.h>
 #include <pthread.h>

src/libguac/timestamp.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "timestamp.h"
+#include "guacamole/timestamp.h"
 
 #include <sys/time.h>
 

src/libguac/unicode.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "unicode.h"
+#include "guacamole/unicode.h"
 
 #include <stddef.h>
 

src/libguac/user-handlers.c

@@ -19,12 +19,12 @@
 
 #include "config.h"
 
-#include "client.h"
+#include "guacamole/client.h"
-#include "object.h"
+#include "guacamole/object.h"
-#include "protocol.h"
+#include "guacamole/protocol.h"
-#include "stream.h"
+#include "guacamole/stream.h"
-#include "timestamp.h"
+#include "guacamole/timestamp.h"
-#include "user.h"
+#include "guacamole/user.h"
 #include "user-handlers.h"
 
 #include <inttypes.h>

src/libguac/user-handlers.h

@@ -31,8 +31,8 @@
 
 #include "config.h"
 
-#include "client.h"
+#include "guacamole/client.h"
-#include "timestamp.h"
+#include "guacamole/timestamp.h"
 
 /**
  * Internal handler for Guacamole instructions. Instruction handlers will be

src/libguac/user-handshake.c

@@ -19,12 +19,12 @@
 
 #include "config.h"
 
-#include "client.h"
+#include "guacamole/client.h"
-#include "error.h"
+#include "guacamole/error.h"
-#include "parser.h"
+#include "guacamole/parser.h"
-#include "protocol.h"
+#include "guacamole/protocol.h"
-#include "socket.h"
+#include "guacamole/socket.h"
-#include "user.h"
+#include "guacamole/user.h"
 
 #include <pthread.h>
 #include <stdlib.h>

src/libguac/user.c

@@ -19,18 +19,18 @@
 
 #include "config.h"
 
-#include "client.h"
 #include "encode-jpeg.h"
 #include "encode-png.h"
 #include "encode-webp.h"
+#include "guacamole/client.h"
+#include "guacamole/object.h"
+#include "guacamole/pool.h"
+#include "guacamole/protocol.h"
+#include "guacamole/socket.h"
+#include "guacamole/stream.h"
+#include "guacamole/timestamp.h"
+#include "guacamole/user.h"
 #include "id.h"
-#include "object.h"
-#include "pool.h"
-#include "protocol.h"
-#include "socket.h"
-#include "stream.h"
-#include "timestamp.h"
-#include "user.h"
 #include "user-handlers.h"
 
 #include <errno.h>