From 4cac9f15932adee255ed2be1f6d419ffe068c438 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 24 Jul 2009 11:37:16 -0400 Subject: [PATCH] uobject: Move headers into a separate (installable) directory. --- src/Makefile.am | 5 +++-- src/engine/music.c | 6 +++--- src/engine/music.h | 2 +- src/engine/texture.c | 4 ++-- src/engine/texture.h | 2 +- src/exportable.c | 2 +- src/loadable.c | 2 +- src/module.c | 2 +- src/uobject.c | 2 +- src/uobject/Makefile.inc | 3 +++ src/{ => uobject}/exportable.h | 4 ++-- src/{ => uobject}/loadable.h | 4 ++-- src/{ => uobject}/module.h | 4 ++-- src/{ => uobject}/uobject.h | 4 ++-- src/upkg.c | 8 ++++---- 15 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 src/uobject/Makefile.inc rename src/{ => uobject}/exportable.h (96%) rename src/{ => uobject}/loadable.h (96%) rename src/{ => uobject}/module.h (96%) rename src/{ => uobject}/uobject.h (97%) diff --git a/src/Makefile.am b/src/Makefile.am index 1dcd24c..237e2c1 100644 --- 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 ab00b17..565a6a0 100644 --- a/src/engine/music.c +++ b/src/engine/music.c @@ -21,9 +21,9 @@ #include #include -#include "exportable.h" -#include "loadable.h" -#include "uobject.h" +#include +#include +#include #include "music-module.h" #include "music.h" #include "upkg.h" diff --git a/src/engine/music.h b/src/engine/music.h index eeed671..589d64f 100644 --- a/src/engine/music.h +++ b/src/engine/music.h @@ -21,7 +21,7 @@ #define MUSIC_H_ #include -#include "uobject.h" +#include #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 0e6e1c3..9cd6571 100644 --- a/src/engine/texture.c +++ b/src/engine/texture.c @@ -21,8 +21,8 @@ #include #include -#include "exportable.h" -#include "uobject.h" +#include +#include #include "texture.h" #include "upkg.h" diff --git a/src/engine/texture.h b/src/engine/texture.h index d509772..8f4951d 100644 --- a/src/engine/texture.h +++ b/src/engine/texture.h @@ -21,7 +21,7 @@ #define TEXTURE_H_ #include -#include "uobject.h" +#include #define ENGINE_TEXTURE_TYPE (engine_texture_get_type()) #define ENGINE_TEXTURE(obj) \ diff --git a/src/exportable.c b/src/exportable.c index 03349f5..8bda850 100644 --- a/src/exportable.c +++ b/src/exportable.c @@ -19,7 +19,7 @@ #include #include -#include "exportable.h" +#include GType u_object_exportable_get_type(void) { diff --git a/src/loadable.c b/src/loadable.c index 77f6a10..c4970ec 100644 --- a/src/loadable.c +++ b/src/loadable.c @@ -19,7 +19,7 @@ #include #include -#include "loadable.h" +#include GType u_object_loadable_get_type(void) { diff --git a/src/module.c b/src/module.c index bdf0c8b..b1067db 100644 --- a/src/module.c +++ b/src/module.c @@ -24,7 +24,7 @@ #include #include -#include "module.h" +#include #include "avl.h" static unsigned initialized; diff --git a/src/uobject.c b/src/uobject.c index 175a624..ec517b7 100644 --- a/src/uobject.c +++ b/src/uobject.c @@ -23,7 +23,7 @@ #include #include -#include "uobject.h" +#include #include "upkg.h" #include "pack.h" diff --git a/src/uobject/Makefile.inc b/src/uobject/Makefile.inc new file mode 100644 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 e2424f0..da4c719 100644 --- 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 #include 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 f0543ee..dbae55b 100644 --- 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 #include 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 eacca8d..03fe0ec 100644 --- 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 #include 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 efbe28d..ce5e326 100644 --- 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 #include "upkg.h" diff --git a/src/upkg.c b/src/upkg.c index ef44bf6..4e524ef 100644 --- a/src/upkg.c +++ b/src/upkg.c @@ -25,10 +25,10 @@ #include #include "upkg.h" -#include "module.h" -#include "uobject.h" -#include "exportable.h" -#include "loadable.h" +#include +#include +#include +#include enum { MODE_INFO, -- 2.43.2