uobject: Move headers into a separate (installable) directory.

diff --git a/src/Makefile.am b/src/Makefile.am
index 1dcd24c857ac38a0af127d9479db0109d62a858c..237e2c12364888e67cefa4ef2302e6b68c72eda5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,9 @@
 lib_LTLIBRARIES = libuobject.la libupkg.la
 
-include_HEADERS = upkg.h uobject.h
-noinst_HEADERS  = pack.h loadable.h exportable.h module.h avl.h
+include_HEADERS = upkg.h
+noinst_HEADERS  = pack.h avl.h
 
+include uobject/Makefile.inc
 include engine/Makefile.inc
 
 libuobject_la_SOURCES  = uobject.c module.c avl.c loadable.c exportable.c

diff --git a/src/engine/music.c b/src/engine/music.c
index ab00b17d777579e86110adab9903be8f15119300..565a6a0528b975c2441c3363785a18ff0d566dc9 100644 (file)
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -21,9 +21,9 @@
 #include <string.h>
 #include <glib-object.h>
 
-#include "exportable.h"
-#include "loadable.h"
-#include "uobject.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
+#include <uobject/loadable.h>
 #include "music-module.h"
 #include "music.h"
 #include "upkg.h"

diff --git a/src/engine/music.h b/src/engine/music.h
index eeed67143f364b0c1337f245bee43f22072e0181..589d64f6c53301bb4b13b9f558c17372a6ac6f96 100644 (file)
--- a/src/engine/music.h
+++ b/src/engine/music.h
@@ -21,7 +21,7 @@
 #define MUSIC_H_
 
 #include <glib-object.h>
-#include "uobject.h"
+#include <uobject/uobject.h>
 
 #define ENGINE_MUSIC_TYPE (engine_music_get_type())
 #define ENGINE_MUSIC(obj) \

diff --git a/src/engine/texture.c b/src/engine/texture.c
index 0e6e1c354bf8dc12b892425d8d2ccf918308e584..9cd6571bbae872ed89bfe333f9ca7fd4229831de 100644 (file)
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -21,8 +21,8 @@
 #include <string.h>
 #include <glib-object.h>
 
-#include "exportable.h"
-#include "uobject.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
 #include "texture.h"
 #include "upkg.h"
 

diff --git a/src/engine/texture.h b/src/engine/texture.h
index d5097724a0ae8b5c979c544fa30b7756cbf5332b..8f4951dd505a0625323c48d9294c2f085381971f 100644 (file)
--- a/src/engine/texture.h
+++ b/src/engine/texture.h
@@ -21,7 +21,7 @@
 #define TEXTURE_H_
 
 #include <glib-object.h>
-#include "uobject.h"
+#include <uobject/uobject.h>
 
 #define ENGINE_TEXTURE_TYPE (engine_texture_get_type())
 #define ENGINE_TEXTURE(obj) \

diff --git a/src/exportable.c b/src/exportable.c
index 03349f5307130349f4b11e07009b5f2317dfa0c6..8bda8506324711dfc949eca218a5cc059a8d3ab1 100644 (file)
--- a/src/exportable.c
+++ b/src/exportable.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <glib-object.h>
-#include "exportable.h"
+#include <uobject/exportable.h>
 
 GType u_object_exportable_get_type(void)
 {

diff --git a/src/loadable.c b/src/loadable.c
index 77f6a10c4a187faa63c69a56f8eca558728bdac4..c4970ec65178219570e1c620ae24e8a3244ef18a 100644 (file)
--- a/src/loadable.c
+++ b/src/loadable.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <glib-object.h>
-#include "loadable.h"
+#include <uobject/loadable.h>
 
 GType u_object_loadable_get_type(void)
 {

diff --git a/src/module.c b/src/module.c
index bdf0c8bcb676c4506186e800a1183d51c9f5c938..b1067dbd60bda507705eb5dc29c6eea3b3f97676 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <ltdl.h>
 
-#include "module.h"
+#include <uobject/module.h>
 #include "avl.h"
 
 static unsigned initialized;

diff --git a/src/uobject.c b/src/uobject.c
index 175a6243dc202d1c5ee84a7b3af25cfe20c7b49b..ec517b7bd0bb97f60ee7d01e5eaed01a0c118e96 100644 (file)
--- a/src/uobject.c
+++ b/src/uobject.c
@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <glib-object.h>
 
-#include "uobject.h"
+#include <uobject/uobject.h>
 #include "upkg.h"
 #include "pack.h"
 

diff --git a/src/uobject/Makefile.inc b/src/uobject/Makefile.inc
new file mode 100644 (file)
index 0000000..37c0a65
--- /dev/null
+++ b/src/uobject/Makefile.inc
@@ -0,0 +1,3 @@
+uobjectdir = $(includedir)/uobject
+uobject_HEADERS = uobject/uobject.h uobject/exportable.h uobject/loadable.h \
+       uobject/module.h

diff --git a/src/exportable.h b/src/uobject/exportable.h
similarity index 96%
rename from src/exportable.h
rename to src/uobject/exportable.h
index e2424f004a5c2497a1bcb0aa870bed9c24f4174e..da4c719b97fe136d2a751d5e7d47c717811a68f4 100644 (file)
--- a/src/exportable.h
+++ b/src/uobject/exportable.h
@@ -17,8 +17,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef EXPORTABLE_H_
-#define EXPORTABLE_H_
+#ifndef UOBJECT_EXPORTABLE_H_
+#define UOBJECT_EXPORTABLE_H_
 
 #include <stdio.h>
 #include <glib-object.h>

diff --git a/src/loadable.h b/src/uobject/loadable.h
similarity index 96%
rename from src/loadable.h
rename to src/uobject/loadable.h
index f0543ee9302996e1c3f10f3bd3387c8b603ce09d..dbae55bf174c05dc06cb0874a59c4452fdc9701b 100644 (file)
--- a/src/loadable.h
+++ b/src/uobject/loadable.h
@@ -17,8 +17,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LOADABLE_H_
-#define LOADABLE_H_
+#ifndef UOBJECT_LOADABLE_H_
+#define UOBJECT_LOADABLE_H_
 
 #include <stdio.h>
 #include <glib-object.h>

diff --git a/src/module.h b/src/uobject/module.h
similarity index 96%
rename from src/module.h
rename to src/uobject/module.h
index eacca8d007f5ea57c5c63b9da09a8aa6bc0c0240..03fe0ec70d9cdf7680c569e0ffb50bbbcbdee8b0 100644 (file)
--- a/src/module.h
+++ b/src/uobject/module.h
@@ -17,8 +17,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef MODULE_H_
-#define MODULE_H_
+#ifndef UOBJECT_MODULE_H_
+#define UOBJECT_MODULE_H_
 
 #include <glib-object.h>
 #include <ltdl.h>

diff --git a/src/uobject.h b/src/uobject/uobject.h
similarity index 97%
rename from src/uobject.h
rename to src/uobject/uobject.h
index efbe28ddf556f37083cbf78ceacabe67fde804cc..ce5e326ee44092177d0d4a5b2cd9285b0dfa4923 100644 (file)
--- a/src/uobject.h
+++ b/src/uobject/uobject.h
@@ -17,8 +17,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef UOBJECT_H_
-#define UOBJECT_H_
+#ifndef UOBJECT_UOBJECT_H_
+#define UOBJECT_UOBJECT_H_
 
 #include <glib-object.h>
 #include "upkg.h"

diff --git a/src/upkg.c b/src/upkg.c
index ef44bf68e48a47934e43851a8a9d4ae53c4df480..4e524ef8cc2912bb9a83494a6c0fa49146148777 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -25,10 +25,10 @@
 #include <glib-object.h>
 
 #include "upkg.h"
-#include "module.h"
-#include "uobject.h"
-#include "exportable.h"
-#include "loadable.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
+#include <uobject/loadable.h>
+#include <uobject/module.h>
 
 enum {
        MODE_INFO,