engine: Include object headers as <engine/xyz.h>.

This will work with VPATH builds even if the .h file is in the build
tree while the .c file is in the source tree, and vice versa.  For
non-VPATH builds, there should be no change in behaviour.

diff --git a/src/engine/engine.c b/src/engine/engine.c
index b6e7e14a7a2c2ae6a1f3ffc3d6e04ff4618285f4..a22691c02ce049fc015c9e2b864971e4c96cd420 100644 (file)
--- a/src/engine/engine.c
+++ b/src/engine/engine.c
@@ -19,9 +19,9 @@
 #include <stdio.h>
 #include <glib-object.h>
 
-#include "music.h"
-#include "texture.h"
-#include "palette.h"
+#include <engine/music.h>
+#include <engine/texture.h>
+#include <engine/palette.h>
 
 #define init engine_LTX_init
 #define exit engine_LTX_exit

diff --git a/src/engine/music.c b/src/engine/music.c
index 87cbec553d5d14c5a4f66c46b07e98e65cc4fe8d..55253feee7a8c86444d58d92cd27b1356b094f50 100644 (file)
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -23,8 +23,8 @@
 #include <uobject/uobject.h>
 #include <uobject/exportable.h>
 #include <uobject/loadable.h>
+#include <engine/music.h>
 #include "music-module.h"
-#include "music.h"
 #include "upkg.h"
 
 #define MUSIC_GET_PRIV(o) \

diff --git a/src/engine/palette.c b/src/engine/palette.c
index 6ad05944634852bc0917c3cd25a6d84bed7cbc5e..29725ec2e9a701923edc1bb87cc2059259298f83 100644 (file)
--- a/src/engine/palette.c
+++ b/src/engine/palette.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "palette.h"
+#include <engine/palette.h>
 #include "upkg.h"
 
 G_DEFINE_DYNAMIC_TYPE(EnginePalette, engine_palette, U_TYPE_OBJECT);

diff --git a/src/engine/texture.c b/src/engine/texture.c
index 499a397216c4c811090807301d531e463683818e..90cca6e7444dae5874553820e95f9825ae5f5a90 100644 (file)
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -22,8 +22,8 @@
 
 #include <uobject/uobject.h>
 #include <uobject/exportable.h>
-#include "texture.h"
-#include "palette.h"
+#include <engine/texture.h>
+#include <engine/palette.h>
 #include "upkg.h"
 
 #define TEXTURE_GET_PRIV(o) \