[goffice] Compilation: export also gtk related symbols.



commit a0ddee50d4d10ca7dd28949609e563c8f65f3686
Author: Morten Welinder <terra gnome org>
Date:   Tue Oct 1 21:34:06 2013 -0400

    Compilation: export also gtk related symbols.

 ChangeLog           |    1 +
 NEWS                |    4 ++++
 goffice/Makefile.am |   27 ++++++++++++++-------------
 3 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ceb3f5c..1933687 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        * goffice/Makefile.am (goffice.def): Don't export go_plugin_init
        and go_plugin_shutdown (which are prototyped because modules may
        defined them).
+       (ALL_HDRS): Export gtk related headers too.
 
        * goffice/utils/go-styled-object.h: Remove
        go_styled_object_is_filled which isn't implemented.
diff --git a/NEWS b/NEWS
index 027059b..e12208d 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ Jean:
        [#708562]
        * Never redefine GtkJustfication, use GoJustification instead. [#709007]
 
+Morten:
+       * Build fixes.
+       * Win32 work.
+
 --------------------------------------------------------------------------
 goffice 0.10.7:
 
diff --git a/goffice/Makefile.am b/goffice/Makefile.am
index da1ffad..08c5af2 100644
--- a/goffice/Makefile.am
+++ b/goffice/Makefile.am
@@ -539,6 +539,20 @@ ALL_HDRS = $(app_HEADERS) \
        $(math_HEADERS) \
        $(utils_HEADERS)
 
+if WITH_GTK
+ALL_HDRS += \
+       $(canvas_gtk_HEADERS) \
+       $(component_HEADERS) \
+       $(graph_gtk_HEADERS) \
+       $(gtk_HEADERS)
+endif
+
+if GOFFICE_WITH_LASEM
+ALL_HDRS += \
+       $(graph_lasem_HEADERS)
+endif
+
+
 if WITH_WIN32
 LIB_PUBLIC_HDRS = $(libgoffice_ GOFFICE_API_VER@_la_HEADERS)
 
@@ -637,19 +651,6 @@ GOffice_ GOFFICE_API_VER_@_gir_FILES = \
        $(libgoffice_ GOFFICE_API_VER@_la_SOURCES) \
        $(ALL_HDRS)
 
-if WITH_GTK
-GOffice_ GOFFICE_API_VER_@_gir_FILES += \
-       $(canvas_gtk_HEADERS) \
-       $(component_HEADERS) \
-       $(graph_gtk_HEADERS) \
-       $(gtk_HEADERS)
-endif
-
-if GOFFICE_WITH_LASEM
-GOffice_ GOFFICE_API_VER_@_gir_FILES += \
-       $(graph_lasem_HEADERS)
-endif
-
 girdir = $(GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]