gegl r2922 - in trunk: . gegl

[martinn svn gnome org]

Author: martinn
Date: Thu Feb 19 20:46:59 2009
New Revision: 2922
URL: http://svn.gnome.org/viewvc/gegl?rev=2922&view=rev

Log:
Break out GEGL version API from gegl.h into gegl-version.h

Break out the version related parts of the GEGL API into a separate
installed header gegl-version.h so that not the entire gegl.h header
needs to be processed by configure.

Added:
   trunk/gegl/gegl-version.h.in
   trunk/gegl/gegl.h
      - copied, changed from r2921, /trunk/gegl/gegl.h.in
Removed:
   trunk/gegl/gegl.h.in
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gegl/.gitignore
   trunk/gegl/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Feb 19 20:46:59 2009
@@ -53,7 +53,7 @@
 m4_define([graphviz_required_version], [0.0.0])
 
 AC_INIT(gegl, gegl_major_version.gegl_minor_version.gegl_micro_version)
-AC_CONFIG_SRCDIR([gegl/gegl.h.in])
+AC_CONFIG_SRCDIR([gegl/gegl.h])
 
 dnl ==========================================================================
 dnl                              Versioning              
@@ -963,7 +963,7 @@
 Makefile
 bin/Makefile
 gegl/Makefile
-gegl/gegl.h
+gegl/gegl-version.h
 gegl/buffer/Makefile
 gegl/graph/Makefile
 gegl/module/Makefile

Modified: trunk/gegl/.gitignore
==============================================================================
--- trunk/gegl/.gitignore	(original)
+++ trunk/gegl/.gitignore	Thu Feb 19 20:46:59 2009
@@ -3,6 +3,6 @@
 /.deps
 /.libs
 /gegl
-/gegl.h
+/gegl-version.h
 /Makefile
 /Makefile.in

Modified: trunk/gegl/Makefile.am
==============================================================================
--- trunk/gegl/Makefile.am	(original)
+++ trunk/gegl/Makefile.am	Thu Feb 19 20:46:59 2009
@@ -70,6 +70,7 @@
     gegl-chant.h			\
     gegl-simd.h				\
     gegl-plugin.h			\
+    gegl-version.h			\
     buffer/gegl-buffer.h		\
     property-types/gegl-paramspecs.h	\
     property-types/gegl-color.h		\

Added: trunk/gegl/gegl-version.h.in
==============================================================================
--- (empty file)
+++ trunk/gegl/gegl-version.h.in	Thu Feb 19 20:46:59 2009
@@ -0,0 +1,49 @@
+/* This file is the public GEGL API
+ *
+ * GEGL is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * GEGL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * 2000-2008 Â Calvin Williamson, Ãyvind KolÃs.
+ */
+
+#ifndef __GEGL_VERSION_H__
+#define __GEGL_VERSION_H__
+
+
+/***
+ * GEGL version information
+ *
+ * These macros tell the version of GEGL you are compiling against.
+ * GEGL's version number consists of three parts: major, minor and
+ * micro.
+ */
+
+#define GEGL_MAJOR_VERSION @GEGL_MAJOR_VERSION@
+#define GEGL_MINOR_VERSION @GEGL_MINOR_VERSION@
+#define GEGL_MICRO_VERSION @GEGL_MICRO_VERSION@
+
+/**
+ * gegl_get_version:
+ * @major: a pointer to a int where the major version number will be stored
+ * @minor: ditto for the minor version number
+ * @micro: ditto for the micro version number
+ *
+ * This function fetches the version of the GEGL library being used by
+ * the running process.
+ */
+void           gegl_get_version          (int *major,
+                                          int *minor,
+                                          int *micro);
+
+
+#endif

Copied: trunk/gegl/gegl.h (from r2921, /trunk/gegl/gegl.h.in)
==============================================================================
--- /trunk/gegl/gegl.h.in	(original)
+++ trunk/gegl/gegl.h	Thu Feb 19 20:46:59 2009
@@ -22,6 +22,8 @@
 #include <glib-object.h>
 #include <babl/babl.h>
 
+#include <gegl-version.h>
+
 /***
  * The GEGL API:
  *
@@ -108,31 +110,6 @@
 
 
 /***
- * GEGL version information
- *
- * These macros tell the version of GEGL you are compiling against.
- * GEGL's version number consists of three parts: major, minor and
- * micro.
- */
-
-#define GEGL_MAJOR_VERSION @GEGL_MAJOR_VERSION@
-#define GEGL_MINOR_VERSION @GEGL_MINOR_VERSION@
-#define GEGL_MICRO_VERSION @GEGL_MICRO_VERSION@
-
-/**
- * gegl_get_version:
- * @major: a pointer to a int where the major version number will be stored
- * @minor: ditto for the minor version number
- * @micro: ditto for the micro version number
- *
- * This function fetches the version of the GEGL library being used by
- * the running process.
- */
-void           gegl_get_version          (int *major,
-                                          int *minor,
-                                          int *micro);
-
-/***
  * Available operations:
  * Gegl provides means to check for available processing operations that
  * can be used with nodes using #gegl_list_operations and for a specified