diff options
| author | Debarshi Ray <debarshir@gnome.org> | 2016-12-01 19:30:00 +0100 |
|---|---|---|
| committer | Debarshi Ray <debarshir@gnome.org> | 2017-01-07 13:59:56 +0100 |
| commit | 30681a486c0266b5fd0f2a984fba2d1b0dfe8d29 (patch) | |
| tree | 7850ecc4867045fac25984d4bd524d25f0ca4302 | |
| parent | ee1dcc7a555a9cfc7790c517414aa51e84e6abbe (diff) | |
| download | libgd-30681a486c0266b5fd0f2a984fba2d1b0dfe8d29.tar.gz | |
build: Add a main-icon-box flag to LIBGD_INIT
This includes GdMainIconBox, GdMainIconBoxChild, and everything under
_box-common and gtk-hacks.
https://bugzilla.gnome.org/show_bug.cgi?id=774914
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | libgd.m4 | 8 | ||||
| -rw-r--r-- | libgd/gd-types-catalog.c | 10 | ||||
| -rw-r--r-- | libgd/gd.h | 5 |
4 files changed, 35 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index f8530b3..57cd1fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,6 +61,18 @@ nodist_libgd_la_SOURCES += $(box_common_sources) EXTRA_DIST += $(box_common_sources) endif +if LIBGD_MAIN_ICON_BOX +main_icon_box_sources = \ + libgd/gd-main-icon-box.c \ + libgd/gd-main-icon-box.h \ + libgd/gd-main-icon-box-child.c \ + libgd/gd-main-icon-box-child.h \ + $(NULL) + +nodist_libgd_la_SOURCES += $(main_icon_box_sources) +EXTRA_DIST += $(main_icon_box_sources) +endif + if LIBGD__VIEW_COMMON view_common_sources = \ libgd/gd-main-view-generic.c \ @@ -50,6 +50,14 @@ AC_DEFUN([LIBGD_INIT], [ AC_DEFINE([LIBGD_GTK_HACKS], [1], [Description]) ]) + # main-icon-box: + AM_CONDITIONAL([LIBGD_MAIN_ICON_BOX],[_LIBGD_IF_OPTION_SET([main-icon-box],[true],[false])]) + _LIBGD_IF_OPTION_SET([main-icon-box],[ + _LIBGD_SET_OPTION([_box-common]) + _LIBGD_SET_OPTION([gtk-hacks]) + AC_DEFINE([LIBGD_MAIN_ICON_BOX], [1], [Description]) + ]) + # main-view: AM_CONDITIONAL([LIBGD_MAIN_VIEW],[_LIBGD_IF_OPTION_SET([main-view],[true],[false])]) _LIBGD_IF_OPTION_SET([main-view],[ diff --git a/libgd/gd-types-catalog.c b/libgd/gd-types-catalog.c index 9959a61..59d2a4d 100644 --- a/libgd/gd-types-catalog.c +++ b/libgd/gd-types-catalog.c @@ -29,6 +29,11 @@ # include "gd-main-box-item.h" #endif +#ifdef LIBGD_MAIN_ICON_BOX +# include "gd-main-icon-box.h" +# include "gd-main-icon-box-child.h" +#endif + #ifdef LIBGD__VIEW_COMMON # include "gd-main-view-generic.h" # include "gd-styled-text-renderer.h" @@ -75,6 +80,11 @@ gd_ensure_types (void) g_type_ensure (GD_TYPE_MAIN_BOX_ITEM); #endif +#ifdef LIBGD_MAIN_ICON_BOX + g_type_ensure (GD_TYPE_MAIN_ICON_BOX); + g_type_ensure (GD_TYPE_MAIN_ICON_BOX_CHILD); +#endif + #ifdef LIBGD__VIEW_COMMON g_type_ensure (GD_TYPE_MAIN_VIEW_GENERIC); g_type_ensure (GD_TYPE_STYLED_TEXT_RENDERER); @@ -41,6 +41,11 @@ G_BEGIN_DECLS # include <libgd/gd-main-box-item.h> #endif +#ifdef LIBGD_MAIN_ICON_BOX +# include <libgd/gd-main-icon-box.h> +# include <libgd/gd-main-icon-box-child.h> +#endif + #ifdef LIBGD__VIEW_COMMON # include <libgd/gd-main-view-generic.h> # include <libgd/gd-styled-text-renderer.h> |