glom r2031 - in trunk: . glom/libglom/document glom/libglom/document/bakery glom/libglom/document/bakery/view

[murrayc svn gnome org]

Author: murrayc
Date: Thu Mar 26 18:18:01 2009
New Revision: 2031
URL: http://svn.gnome.org/viewvc/glom?rev=2031&view=rev

Log:
2009-03-26  Murray Cumming  <murrayc murrayc com>

* configure.ac: Depend on the latest goocanvasmm for the new API.
* glom/libglom/document/bakery/Makefile.am:
* glom/libglom/document/bakery/view/Makefile.am: Install the headers as in 
the other directories.
* glom/libglom/document/document_glom.h: Tell SWIG to add using Glom because 
it gets confused about the namespace.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/glom/libglom/document/bakery/Makefile.am
   trunk/glom/libglom/document/bakery/view/Makefile.am
   trunk/glom/libglom/document/document_glom.h

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Mar 26 18:18:01 2009
@@ -106,7 +106,7 @@
 
 
 # Do not require, goocanvas and gtksourceviewmm in client only mode
-REQUIRED_LIBS="gtkmm-2.4 >= 2.14 gthread-2.0 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 pygda-4.0 >= 2.25.3 pygtk-2.0 >= 2.6.0 libgdamm-4.0 >= 3.99.14 libgda-4.0 >= 4.0.0 libgda-postgres-4.0 goocanvasmm-1.0 >= 0.13.0"
+REQUIRED_LIBS="gtkmm-2.4 >= 2.14 gthread-2.0 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 pygda-4.0 >= 2.25.3 pygtk-2.0 >= 2.6.0 libgdamm-4.0 >= 3.99.14 libgda-4.0 >= 4.0.0 libgda-postgres-4.0 goocanvasmm-1.0 >= 0.14.0"
 if test $enable_client_only != yes; then
 	REQUIRED_LIBS="$REQUIRED_LIBS gtksourceviewmm-2.0"
 fi

Modified: trunk/glom/libglom/document/bakery/Makefile.am
==============================================================================
--- trunk/glom/libglom/document/bakery/Makefile.am	(original)
+++ trunk/glom/libglom/document/bakery/Makefile.am	Thu Mar 26 18:18:01 2009
@@ -5,6 +5,9 @@
 h_sources = document.h document_xml.h
 cc_sources = document.cc document_xml.cc
 
+library_includedir=$(includedir)/glom-1.0/libglom/document/bakery
+library_include_HEADERS = $(h_sources)
+
 noinst_LTLIBRARIES = libdocument_bakery.la
 libdocument_bakery_la_SOURCES = $(h_sources) $(cc_sources)
 

Modified: trunk/glom/libglom/document/bakery/view/Makefile.am
==============================================================================
--- trunk/glom/libglom/document/bakery/view/Makefile.am	(original)
+++ trunk/glom/libglom/document/bakery/view/Makefile.am	Thu Mar 26 18:18:01 2009
@@ -11,6 +11,9 @@
 h_sources = view.h viewbase.h view_composite.h 
 cc_sources = view.cc viewbase.cc view_composite.cc 
 
+library_includedir=$(includedir)/glom-1.0/libglom/document/bakery/view
+library_include_HEADERS = $(h_sources)
+
 noinst_LTLIBRARIES = libdocument_bakery_view.la
 libdocument_bakery_view_la_SOURCES = $(h_sources) $(cc_sources)
 

Modified: trunk/glom/libglom/document/document_glom.h
==============================================================================
--- trunk/glom/libglom/document/document_glom.h	(original)
+++ trunk/glom/libglom/document/document_glom.h	Thu Mar 26 18:18:01 2009
@@ -51,8 +51,9 @@
 %include "typemaps.i"
 
 %inline %{ #include <libglom/document/document_glom.h> %}
-%inline %{ typedef unsigned int guint; %}
-%inline %{ namespace Glib { typedef std::string ustring; } %}
+%inline %{ using namespace Glom; %}
+//%inline %{ typedef unsigned int guint; %}
+//%inline %{ namespace Glib { typedef std::string ustring; } %}