split the version.h into render/ and obt/ copies, with the appropriate version info

diff --git a/Makefile.am b/Makefile.am
index d99fa30be050b31268e857e4e46c951c0b1cb455..23e3bda7398d484b1dc18b32f63c5476586cd370 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@ rcdir           = $(configdir)/openbox
 xsessionsdir    = $(datadir)/xsessions
 gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
-pubincludedir   = $(includedir)/openbox/@OBT_VERSION@/openbox
+obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt/
+rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render/
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 
@@ -376,7 +377,7 @@ dist_syscrash_theme_DATA= \
 
 ## public headers ##
 
-pubinclude_HEADERS = \
+rrpubinclude_HEADERS = \
        render/color.h \
        render/font.h \
        render/geom.h \
@@ -386,7 +387,9 @@ pubinclude_HEADERS = \
        render/mask.h \
        render/render.h \
        render/theme.h \
-       render/version.h \
+       render/version.h
+
+obtpubinclude_HEADERS = \
        obt/display.h \
        obt/keyboard.h \
        obt/mainloop.h \
@@ -397,9 +400,6 @@ pubinclude_HEADERS = \
        obt/version.h \
        obt/xevent.h
 
-nodist_pubinclude_HEADERS = \
-       version.h
-
 nodist_pkgconfig_DATA = \
        render/obrender-4.0.pc \
        obt/obt-4.0.pc
@@ -444,7 +444,6 @@ nodist_xsessions_DATA = \
        data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-       version.h.in \
        data/rc.xsd \
        data/menu.xsd \
        data/xsession/openbox.desktop.in \
@@ -461,8 +460,10 @@ dist_noinst_DATA = \
        doc/openbox-gnome-session.1.in \
        doc/openbox-kde-session.1.sgml \
        doc/openbox-kde-session.1.in \
+       render/version.h.in \
        render/obrender-4.0.pc.in \
        obt/obt-4.0.pc.in \
+       obt/version.h.in \
        tools/themeupdate/themeupdate.py \
        tests/hideshow.py \
        tests/Makefile \

diff --git a/configure.ac b/configure.ac
index ee73919c830fc1a0ba8ef3a188d3002a6818bffd..463e7fb352ac31e7885bc336b249e6f740b38992 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,14 +18,14 @@ RR_MINOR_VERSION=0
 RR_MICRO_VERSION=17
 RR_INTERFACE_AGE=0
 RR_BINARY_AGE=0
-RR_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
+RR_VERSION=$RR_MAJOR_VERSION.$RR_MINOR_VERSION
 
 OBT_MAJOR_VERSION=4
 OBT_MINOR_VERSION=0
 OBT_MICRO_VERSION=0
 OBT_INTERFACE_AGE=0
 OBT_BINARY_AGE=0
-OBT_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
+OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION
 
 AC_SUBST(RR_MAJOR_VERSION)
 AC_SUBST(RR_MINOR_VERSION)
@@ -180,7 +180,8 @@ AC_CONFIG_FILES([
   po/Makefile.in
   render/obrender-4.0.pc
   obt/obt-4.0.pc
-  version.h
+  render/version.h
+  obt/version.h
 ])
 AC_CONFIG_COMMANDS([doc],
                    [test -d doc || mkdir doc])

diff --git a/obt/parse.h b/obt/parse.h
index 37f0439e6e1bf5884ff59f15b8ebeb97c1a7142e..8e5acd726508f4d6e8edaec101d561297c1a0bde 100644 (file)
--- a/obt/parse.h
+++ b/obt/parse.h
@@ -19,8 +19,6 @@
 #ifndef __obt_parse_h
 #define __obt_parse_h
 
-#include "version.h"
-
 #include <libxml/parser.h>
 #include <glib.h>
 

diff --git a/obt/version.h.in b/obt/version.h.in
new file mode 100644 (file)
index 0000000..8adfcf8
--- /dev/null
+++ b/obt/version.h.in
@@ -0,0 +1,15 @@
+#ifndef obt__version_h
+#define obt__version_h
+
+#define OBT_MAJOR_VERSION @OBT_MAJOR_VERSION@
+#define OBT_MINOR_VERSION @OBT_MINOR_VERSION@
+#define OBT_MICRO_VERSION @OBT_MICRO_VERSION@
+#define OBT_VERSION OBT_MAJOR_VERSION.OBT_MINOR_VERSION.OBT_MICRO_VERSION
+
+#define OBT_CHECK_VERSION(major,minor,micro) \
+    (OBT_MAJOR_VERSION > (major) || \
+     (OBT_MAJOR_VERSION == (major) && OBT_MINOR_VERSION > (minor)) || \
+     (OBT_MAJOR_VERSION == (major) && OBT_MINOR_VERSION == (minor) && \
+      OBT_MICRO_VERSION >= (micro)))
+
+#endif

diff --git a/render/render.h b/render/render.h
index 1f87c6e08a91648b1a0e799f81d36b071c2c317a..e4ca914b96172f16257a5ab17f7388e0b2fb5bc7 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -22,7 +22,7 @@
 #define __render_h
 
 #include "geom.h"
-#include "version.h"
+#include "render/version.h"
 
 #include <X11/Xlib.h> /* some platforms dont include this as needed for Xft */
 #include <pango/pangoxft.h>

diff --git a/render/version.h.in b/render/version.h.in
new file mode 100644 (file)
index 0000000..0ff30b5
--- /dev/null
+++ b/render/version.h.in
@@ -0,0 +1,15 @@
+#ifndef rr__version_h
+#define rr__version_h
+
+#define RR_MAJOR_VERSION @RR_MAJOR_VERSION@
+#define RR_MINOR_VERSION @RR_MINOR_VERSION@
+#define RR_MICRO_VERSION @RR_MICRO_VERSION@
+#define RR_VERSION RR_MAJOR_VERSION.RR_MINOR_VERSION.RR_MICRO_VERSION
+
+#define RR_CHECK_VERSION(major,minor,micro) \
+    (RR_MAJOR_VERSION > (major) || \
+     (RR_MAJOR_VERSION == (major) && RR_MINOR_VERSION > (minor)) || \
+     (RR_MAJOR_VERSION == (major) && RR_MINOR_VERSION == (minor) && \
+      RR_MICRO_VERSION >= (micro)))
+
+#endif

diff --git a/version.h.in b/version.h.in
deleted file mode 100644 (file)
index da3f02e..0000000
--- a/version.h.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef ob__version_h
-#define ob__version_h
-
-#define OB_MAJOR_VERSION @OB_MAJOR_VERSION@
-#define OB_MINOR_VERSION @OB_MINOR_VERSION@
-#define OB_MICRO_VERSION @OB_MICRO_VERSION@
-#define OB_VERSION OB_MAJOR_VERSION.OB_MINOR_VERSION.OB_MICRO_VERSION
-
-#define OB_CHECK_VERSION(major,minor,micro) \
-    (OB_MAJOR_VERSION > (major) || \
-     (OB_MAJOR_VERSION == (major) && OB_MINOR_VERSION > (minor)) || \
-     (OB_MAJOR_VERSION == (major) && OB_MINOR_VERSION == (minor) && \
-      OB_MICRO_VERSION >= (micro)))
-
-#endif