Mimick glib's way of dealing with libfoo.h

zongwave · Jun 24, 2006 · 54b9d7e · 54b9d7e
1 parent 3b2b2a9
commit 54b9d7e
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 18 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,18 @@
+2006-06-25  Øyvind Kolås  <[email protected]>
+
+	Changed the way the headers are installed to mimick glib.
+	gegl.h is installed in prefix/include/gegl-x.x/gegl.h and
+	the rest in a gegl subdir in that directory.
+
+	If you've got an existing GEGL installation you need to
+	perform a rm -rf on your gegl include dir before doing
+	make install, for the header enviroment to be correct.
+
+	* gegl.pc.in: Changed specified path.
+	* gegl/Makefile.am: Added a new subdir path to install headers in.
+	* gegl/gegl-xml.h: changed header to handle change.
+	* gegl/gegl.h: include headers with path.
+
 2006-06-24  Øyvind Kolås  <[email protected]>
 
 	* gegl/buffer/gegl-buffer.h, gegl/buffer/gegl-tile-backend.c:

diff --git a/gegl.pc.in b/gegl.pc.in
@@ -8,4 +8,4 @@ Description: Gegl Graphical Library
 Version: @VERSION@
 Requires: @GLIB_PACKAGES@ babl
 Libs: -L${libdir} -lgegl-@GEGL_API_VERSION@
-Cflags: -I${includedir}/gegl-1.0/gegl
+Cflags: -I${includedir}/gegl-1.0
diff --git a/gegl/Makefile.am b/gegl/Makefile.am
@@ -26,7 +26,6 @@ GEGL_sources = \
 	gegl-xml.c
 
 GEGL_public_headers = \
-	gegl.h			\
 	gegl-connection.h	\
 	gegl-graph.h		\
 	gegl-init.h		\
@@ -54,9 +53,11 @@ AM_LDFLAGS =  \
 	@DEP_LIBS@ @BABL_LIBS@
 
 
-libgeglincludedir = $(includedir)/gegl-1.0/gegl
+libgeglincludedir = $(includedir)/gegl-1.0
+libgeglsubincludedir = $(includedir)/gegl-1.0/gegl
 
-libgeglinclude_HEADERS = $(GEGL_public_headers) 
+libgeglinclude_HEADERS = gegl.h
+libgeglsubinclude_HEADERS = $(GEGL_public_headers) 
 
 
 #BUILT_SOURCES = \

diff --git a/gegl/gegl-xml.h b/gegl/gegl-xml.h
@@ -21,7 +21,7 @@
 #ifndef GEGL_XML_H
 #define GEGL_XML_H
 
-#include <gegl-types.h>
+#include "gegl-types.h"
 
 gchar    * gegl_to_xml    (GeglNode *gegl);
 GeglNode * gegl_xml_parse (const gchar *xmldata);

diff --git a/gegl/gegl.h b/gegl/gegl.h
@@ -23,19 +23,19 @@
 
 #include <glib-object.h>
 
-#include <gegl-types.h>
+#include <gegl/gegl-types.h>
 
-#include <gegl-connection.h>
-#include <gegl-graph.h>
-#include <gegl-init.h>
-#include <gegl-node.h>
-#include <gegl-object.h>
-#include <gegl-operation.h>
-#include <gegl-pad.h>
-#include <gegl-utils.h>
-#include <gegl-visitable.h>
-#include <gegl-visitor.h>
-#include <gegl-buffer.h>
-#include <gegl-xml.h>
+#include <gegl/gegl-connection.h>
+#include <gegl/gegl-graph.h>
+#include <gegl/gegl-init.h>
+#include <gegl/gegl-node.h>
+#include <gegl/gegl-object.h>
+#include <gegl/gegl-operation.h>
+#include <gegl/gegl-pad.h>
+#include <gegl/gegl-utils.h>
+#include <gegl/gegl-visitable.h>
+#include <gegl/gegl-visitor.h>
+#include <gegl/gegl-buffer.h>
+#include <gegl/gegl-xml.h>
 
 #endif  /* __GEGL_H__ */