diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-14 13:50:00 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-14 13:50:00 +0000 |
| commit | aec93fbf715a45afea3c1314af869c240759be9e (patch) | |
| tree | 5ded0b2235c6fba705c7beddbfa8c32d0e967909 /src | |
| parent | Workaround for gtkmm build issue with dbus API (diff) | |
| download | inkscape-aec93fbf715a45afea3c1314af869c240759be9e.tar.gz inkscape-aec93fbf715a45afea3c1314af869c240759be9e.zip | |
Add --enable-gtk3-experimental build + use external GDL if possible
(bzr r11244)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/libgdl/Makefile_insert | 43 | ||||
| -rw-r--r-- | src/ui/widget/dock-item.h | 4 |
3 files changed, 56 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2ab4d0030..c27af0800 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,12 +19,18 @@ bin_PROGRAMS = inkscape inkview #if WITH_INKBOARD #libpedro = pedro/libpedro.a #endif + +if !WITH_EXT_GDL +internal_GDL = libgdl/libgdl.a +endif + + noinst_LIBRARIES = \ libinkscape.a \ dom/libdom.a \ libcroco/libcroco.a \ libavoid/libavoid.a \ - libgdl/libgdl.a \ + $(internal_GDL) \ libcola/libcola.a \ libvpsc/libvpsc.a \ livarot/libvarot.a \ @@ -46,6 +52,7 @@ all_libs = \ $(INKBOARD_LIBS) \ $(LIBWPG_LIBS) \ $(DBUS_LIBS) \ + $(GDL_LIBS) \ $(IMAGEMAGICK_LIBS) # Add sources common for Inkscape and Inkview to this variable. @@ -68,6 +75,7 @@ INCLUDES = \ $(INKBOARD_CFLAGS) \ $(LIBWPG_CFLAGS) \ $(DBUS_CFLAGS) \ + $(GDL_CFLAGS) \ $(XFT_CFLAGS) \ $(LCMS_CFLAGS) \ $(POPPLER_CFLAGS) \ diff --git a/src/libgdl/Makefile_insert b/src/libgdl/Makefile_insert index e151fd5d6..788df0673 100644 --- a/src/libgdl/Makefile_insert +++ b/src/libgdl/Makefile_insert @@ -1,5 +1,46 @@ ## Makefile.am fragment sourced by src/Makefile.am. +if WITH_EXT_GDL + +EXTRA_DIST += \ + libgdl/gdl-tools.h \ + libgdl/gdl-dock-object.h \ + libgdl/gdl-dock-master.h \ + libgdl/gdl-dock.h \ + libgdl/gdl-dock-item.h \ + libgdl/gdl-dock-notebook.h \ + libgdl/gdl-dock-paned.h \ + libgdl/gdl-dock-tablabel.h \ + libgdl/gdl-dock-placeholder.h \ + libgdl/gdl-dock-bar.h \ + libgdl/gdl-stock-icons.h \ + libgdl/gdl-i18n.h \ + libgdl/gdl-i18n.c \ + libgdl/gdl-dock-object.c \ + libgdl/gdl-dock-master.c \ + libgdl/gdl-dock.c \ + libgdl/gdl-dock-item.c \ + libgdl/gdl-dock-item-button-image.c \ + libgdl/gdl-dock-item-button-image.h \ + libgdl/gdl-dock-item-grip.h \ + libgdl/gdl-dock-item-grip.c \ + libgdl/gdl-dock-notebook.c \ + libgdl/gdl-dock-paned.c \ + libgdl/gdl-dock-tablabel.c \ + libgdl/gdl-dock-placeholder.c \ + libgdl/gdl-dock-bar.c \ + libgdl/gdl-switcher.h \ + libgdl/gdl-switcher.c \ + libgdl/gdl-win32.h \ + libgdl/gdl-win32.c \ + libgdl/libgdltypebuiltins.h \ + libgdl/libgdltypebuiltins.c \ + libgdl/libgdlmarshal.h \ + libgdl/libgdlmarshal.c \ + libgdl/gdl.h + +else # WITH_EXT_GDL + libgdl/all: libgdl/libgdl.a libgdl/clean: @@ -41,3 +82,5 @@ libgdl_libgdl_a_SOURCES = \ libgdl/libgdlmarshal.h \ libgdl/libgdlmarshal.c \ libgdl/gdl.h + +endif diff --git a/src/ui/widget/dock-item.h b/src/ui/widget/dock-item.h index 75ffea1a0..608badb62 100644 --- a/src/ui/widget/dock-item.h +++ b/src/ui/widget/dock-item.h @@ -15,7 +15,11 @@ #include <gtkmm/frame.h> #include <gtkmm/window.h> +#if WITH_EXT_GDL +#include <gdl/gdl.h> +#else #include "libgdl/gdl.h" +#endif namespace Gtk { class HButtonBox; |