gegl r1850 - in trunk: . bin gegl gegl/buffer gegl/operation gegl/property-types

[ok svn gnome org]

Author: ok
Date: Thu Jan 17 23:01:55 2008
New Revision: 1850
URL: http://svn.gnome.org/viewvc/gegl?rev=1850&view=rev

Log:
Reorganized all installed header files to end up in the same top-level
folder. Please clean out your installed gegl headers before doing 
make install. External applications or libraries using GeglBuffer
should strip the include down to <gegl-buffer.h>.
* bin/Makefile.am:
* bin/gegl-node-editor.c:
* gegl/Makefile.am:
* gegl/buffer/Makefile.am:
* gegl/gegl.h:
* gegl/operation/Makefile.am:
* gegl/operation/gegl-operation.h:
* gegl/property-types/Makefile.am:


Modified:
   trunk/ChangeLog
   trunk/bin/Makefile.am
   trunk/bin/gegl-node-editor.c
   trunk/gegl/Makefile.am
   trunk/gegl/buffer/Makefile.am
   trunk/gegl/gegl.h
   trunk/gegl/operation/Makefile.am
   trunk/gegl/operation/gegl-operation.h
   trunk/gegl/property-types/Makefile.am

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	(original)
+++ trunk/bin/Makefile.am	Thu Jan 17 23:01:55 2008
@@ -35,6 +35,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)	-I$(top_srcdir)/gegl -I$(top_srcdir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/property-types \
 	@DEP_CFLAGS@ @GTK_CFLAGS@ @BABL_CFLAGS@ @PNG_CFLAGS@
 
 AM_LDFLAGS =  \

Modified: trunk/bin/gegl-node-editor.c
==============================================================================
--- trunk/bin/gegl-node-editor.c	(original)
+++ trunk/bin/gegl-node-editor.c	Thu Jan 17 23:01:55 2008
@@ -26,6 +26,7 @@
 #include "gegl.h"
 #include "gegl-node-editor.h"
 #include "gegl-view.h"
+#include "gegl-paramspecs.h"
 #include "editor.h"
 
 GtkWidget *
@@ -173,7 +174,7 @@
 {
   GParamSpec *param_spec = data;
   GeglNode   *node = g_object_get_data (G_OBJECT (entry), "node");
-  const gchar *entry_text;
+  const gchar *entry_text = NULL;
   const gchar *prop_name = param_spec->name;
 
   if (param_spec->value_type != G_TYPE_BOOLEAN)

Modified: trunk/gegl/Makefile.am
==============================================================================
--- trunk/gegl/Makefile.am	(original)
+++ trunk/gegl/Makefile.am	Thu Jan 17 23:01:55 2008
@@ -29,8 +29,6 @@
 	gegl-instrument.h		\
 	gegl-module.h
 
-GEGL_public_headers = gegl-utils.h
-
 libgegl_ GEGL_API_VERSION@_la_SOURCES = $(GEGL_sources) $(GEGL_public_headers)
 
 libgegl_ GEGL_API_VERSION@_la_LIBADD =	\
@@ -52,7 +50,5 @@
 AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\"
 
 libgegl_ GEGL_API_VERSION@includedir = $(includedir)/gegl-$(GEGL_API_VERSION)
-libgegl_ GEGL_API_VERSION@subincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl
 
-libgegl_ GEGL_API_VERSION@include_HEADERS = gegl.h
-libgegl_ GEGL_API_VERSION@subinclude_HEADERS = $(GEGL_public_headers) 
+libgegl_ GEGL_API_VERSION@include_HEADERS = gegl.h gegl-utils.h buffer/gegl-buffer.h property-types/gegl-paramspecs.h

Modified: trunk/gegl/buffer/Makefile.am
==============================================================================
--- trunk/gegl/buffer/Makefile.am	(original)
+++ trunk/gegl/buffer/Makefile.am	Thu Jan 17 23:01:55 2008
@@ -53,9 +53,6 @@
     gegl-provider.h
 
 libbuffer_la_SOURCES = $(BUFFER_sources) $(BUFFER_headers)
-libbufferinclude_HEADERS = gegl-buffer.h
-
-libbufferincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/buffer
 
 INCLUDES = \
 	   -I$(top_srcdir)	\

Modified: trunk/gegl/gegl.h
==============================================================================
--- trunk/gegl/gegl.h	(original)
+++ trunk/gegl/gegl.h	Thu Jan 17 23:01:55 2008
@@ -937,7 +937,5 @@
 
 /*** this line with it's three starting *** is here to trick the API parser.
  */
-#include "gegl/property-types/gegl-paramspecs.h"
-#include <babl/babl.h>
 
 #endif  /* __GEGL_H__ */

Modified: trunk/gegl/operation/Makefile.am
==============================================================================
--- trunk/gegl/operation/Makefile.am	(original)
+++ trunk/gegl/operation/Makefile.am	Thu Jan 17 23:01:55 2008
@@ -31,7 +31,8 @@
 #liboperationincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/operation
 
 INCLUDES = \
-	   -I$(top_srcdir)	\
-	   -I$(top_srcdir)/gegl	\
+	   -I$(top_srcdir)		\
+	   -I$(top_srcdir)/gegl		\
+	   -I$(top_srcdir)/gegl/buffer	\
 	   @DEP_CFLAGS@ @BABL_CFLAGS@
 

Modified: trunk/gegl/operation/gegl-operation.h
==============================================================================
--- trunk/gegl/operation/gegl-operation.h	(original)
+++ trunk/gegl/operation/gegl-operation.h	Thu Jan 17 23:01:55 2008
@@ -23,7 +23,7 @@
 #include <glib-object.h>
 #include <babl/babl.h>
 #include "gegl-types.h"
-#include "gegl/buffer/gegl-buffer.h"
+#include "gegl-buffer.h"
 
 G_BEGIN_DECLS
 

Modified: trunk/gegl/property-types/Makefile.am
==============================================================================
--- trunk/gegl/property-types/Makefile.am	(original)
+++ trunk/gegl/property-types/Makefile.am	Thu Jan 17 23:01:55 2008
@@ -15,9 +15,6 @@
 
 
 libpropertytypes_la_SOURCES = $(PROPERTYTYPES_sources) $(PROPERTYTYPES_headers)
-libpropertytypesinclude_HEADERS = gegl-paramspecs.h #$(PROPERTYTYPES_headers)
-
-libpropertytypesincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/property-types
 
 INCLUDES = \
 	   -I$(top_srcdir)	\