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/Makefile.am | |
| 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/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 9 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) \ |