[gimp] plug-ins: link file-raw aginst libgimpcolor and libgimpconfig explicitly
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: link file-raw aginst libgimpcolor and libgimpconfig explicitly
- Date: Mon, 9 Oct 2017 16:35:26 +0000 (UTC)
commit f47df72dc607e6a7f2851c726990d1d44c5a684b
Author: Michael Natterer <mitch gimp org>
Date: Mon Oct 9 18:33:02 2017 +0200
plug-ins: link file-raw aginst libgimpcolor and libgimpconfig explicitly
otherwise, implicit transitive linking will pull in the installed
libs, not the ones from the source tree, and the build can fail when
any of the libs' APIs changes.
Also remove some useless #includes.
plug-ins/file-raw/Makefile.am | 8 ++++++++
plug-ins/file-raw/file-darktable.c | 1 -
plug-ins/file-raw/file-raw-placeholder.c | 1 -
3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/plug-ins/file-raw/Makefile.am b/plug-ins/file-raw/Makefile.am
index c9dbdb9..eb5b88b 100644
--- a/plug-ins/file-raw/Makefile.am
+++ b/plug-ins/file-raw/Makefile.am
@@ -2,6 +2,8 @@
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
filerawdatadir = $(gimpdatadir)/file-raw
@@ -50,6 +52,8 @@ file_raw_placeholder_SOURCES = \
file_darktable_LDADD = \
$(libgimp) \
$(libgimpbase) \
+ $(libgimpcolor) \
+ $(libgimpconfig) \
$(CAIRO_LIBS) \
$(GEGL_LIBS) \
$(RT_LIBS) \
@@ -59,6 +63,8 @@ file_darktable_LDADD = \
file_rawtherapee_LDADD = \
$(libgimp) \
$(libgimpbase) \
+ $(libgimpcolor) \
+ $(libgimpconfig) \
$(CAIRO_LIBS) \
$(GEGL_LIBS) \
$(RT_LIBS) \
@@ -68,6 +74,8 @@ file_rawtherapee_LDADD = \
file_raw_placeholder_LDADD = \
$(libgimp) \
$(libgimpbase) \
+ $(libgimpcolor) \
+ $(libgimpconfig) \
$(CAIRO_LIBS) \
$(GEGL_LIBS) \
$(RT_LIBS) \
diff --git a/plug-ins/file-raw/file-darktable.c b/plug-ins/file-raw/file-darktable.c
index 27ecf80..d8bb252 100644
--- a/plug-ins/file-raw/file-darktable.c
+++ b/plug-ins/file-raw/file-darktable.c
@@ -27,7 +27,6 @@
#include <glib/gstdio.h>
#include <libgimp/gimp.h>
-#include <libgimp/gimpui.h>
#include "libgimp/stdplugins-intl.h"
diff --git a/plug-ins/file-raw/file-raw-placeholder.c b/plug-ins/file-raw/file-raw-placeholder.c
index 52b064e..a9b872b 100644
--- a/plug-ins/file-raw/file-raw-placeholder.c
+++ b/plug-ins/file-raw/file-raw-placeholder.c
@@ -23,7 +23,6 @@
#include "config.h"
#include <libgimp/gimp.h>
-#include <libgimp/gimpui.h>
#include "libgimp/stdplugins-intl.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]