diff options
| author | Debarshi Ray <debarshir@gnome.org> | 2016-12-01 16:37:03 +0100 |
|---|---|---|
| committer | Debarshi Ray <debarshir@gnome.org> | 2017-01-07 13:59:56 +0100 |
| commit | 29ba9ed22d50f6abfd1bbb6bd5116e8e68ddfe90 (patch) | |
| tree | 2240cc5b05005a874f49a2927e93d6902c3dd44d | |
| parent | 7ea63a7ff633dfaef9663d741ae8fc45fc6af31f (diff) | |
| download | libgd-29ba9ed22d50f6abfd1bbb6bd5116e8e68ddfe90.tar.gz | |
build: Add a _box-common flag to LIBGD_INIT
This includes GdMainBoxChild, GdMainBoxGeneric, and GdMainBoxItem
interfaces. It is meant to be used by those that implement these
interfaces.
https://bugzilla.gnome.org/show_bug.cgi?id=774914
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | libgd.m4 | 6 | ||||
| -rw-r--r-- | libgd/gd-types-catalog.c | 12 | ||||
| -rw-r--r-- | libgd/gd.h | 6 |
4 files changed, 38 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 5d22871..f8530b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,6 +47,20 @@ nodist_libgd_la_SOURCES += $(gtk_hacks_sources) EXTRA_DIST += $(gtk_hacks_sources) endif +if LIBGD__BOX_COMMON +box_common_sources = \ + libgd/gd-main-box-child.c \ + libgd/gd-main-box-child.h \ + libgd/gd-main-box-generic.c \ + libgd/gd-main-box-generic.h \ + libgd/gd-main-box-item.c \ + libgd/gd-main-box-item.h \ + $(NULL) + +nodist_libgd_la_SOURCES += $(box_common_sources) +EXTRA_DIST += $(box_common_sources) +endif + if LIBGD__VIEW_COMMON view_common_sources = \ libgd/gd-main-view-generic.c \ @@ -107,6 +107,12 @@ AC_DEFUN([LIBGD_INIT], [ GOBJECT_INTROSPECTION_REQUIRE([0.9.6]) ]) + # _box-common: + AM_CONDITIONAL([LIBGD__BOX_COMMON],[_LIBGD_IF_OPTION_SET([_box-common],[true],[false])]) + _LIBGD_IF_OPTION_SET([_box-common],[ + AC_DEFINE([LIBGD__BOX_COMMON], [1], [Description]) + ]) + # _view-common: AM_CONDITIONAL([LIBGD__VIEW_COMMON],[_LIBGD_IF_OPTION_SET([_view-common],[true],[false])]) _LIBGD_IF_OPTION_SET([_view-common],[ diff --git a/libgd/gd-types-catalog.c b/libgd/gd-types-catalog.c index 2ba467a..9959a61 100644 --- a/libgd/gd-types-catalog.c +++ b/libgd/gd-types-catalog.c @@ -23,6 +23,12 @@ #include "gd-types-catalog.h" +#ifdef LIBGD__BOX_COMMON +# include "gd-main-box-child.h" +# include "gd-main-box-generic.h" +# include "gd-main-box-item.h" +#endif + #ifdef LIBGD__VIEW_COMMON # include "gd-main-view-generic.h" # include "gd-styled-text-renderer.h" @@ -63,6 +69,12 @@ void gd_ensure_types (void) { +#ifdef LIBGD__BOX_COMMON + g_type_ensure (GD_TYPE_MAIN_BOX_CHILD); + g_type_ensure (GD_TYPE_MAIN_BOX_GENERIC); + g_type_ensure (GD_TYPE_MAIN_BOX_ITEM); +#endif + #ifdef LIBGD__VIEW_COMMON g_type_ensure (GD_TYPE_MAIN_VIEW_GENERIC); g_type_ensure (GD_TYPE_STYLED_TEXT_RENDERER); @@ -35,6 +35,12 @@ G_BEGIN_DECLS # include <libgd/gd-entry-focus-hack.h> #endif +#ifdef LIBGD__BOX_COMMON +# include <libgd/gd-main-box-child.h> +# include <libgd/gd-main-box-generic.h> +# include <libgd/gd-main-box-item.h> +#endif + #ifdef LIBGD__VIEW_COMMON # include <libgd/gd-main-view-generic.h> # include <libgd/gd-styled-text-renderer.h> |