[gimp] app: Make tests build
- From: Martin Nordholts <martinn src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: Make tests build
- Date: Thu, 10 May 2012 20:13:54 +0000 (UTC)
commit d7db79c2f2b9dd93973a865d1a03978d836e88ff
Author: Martin Nordholts <martinn src gnome org>
Date: Thu May 10 22:01:29 2012 +0200
app: Make tests build
In particular: link.
app/config/Makefile.am | 1 +
app/tests/Makefile.am | 7 ++++++-
libgimp/Makefile.am | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index 6a936c9..afa63f6 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -99,6 +99,7 @@ test_config_LDADD = \
../paint/libapppaint.a \
../composite/libappcomposite.a \
../gegl/libappgegl.a \
+ ../operations/libappoperations.a \
libappconfig.a \
../paint-funcs/libapppaint-funcs.a \
../base/libappbase.a \
diff --git a/app/tests/Makefile.am b/app/tests/Makefile.am
index 5ec597a..dd5eaa1 100644
--- a/app/tests/Makefile.am
+++ b/app/tests/Makefile.am
@@ -50,6 +50,7 @@ libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
+libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
AM_CPPFLAGS = \
-I$(top_srcdir) \
@@ -79,7 +80,9 @@ AM_LDFLAGS = \
-u $(SYMPREFIX)menus_save \
-u $(SYMPREFIX)gimp_tools_save \
-u $(SYMPREFIX)gimp_curve_map_pixels \
- -u $(SYMPREFIX)gimp_param_spec_duplicate
+ -u $(SYMPREFIX)gimp_image_base_type \
+ -u $(SYMPREFIX)gimp_param_spec_duplicate \
+ -u $(SYMPREFIX)gimp_lebl_dialog
# Note that we have some duplicate entries here too to work around
# circular dependencies and systems on the same architectural layer as
@@ -109,7 +112,9 @@ LDADD = \
$(top_builddir)/app/base/libappbase.a \
$(top_builddir)/app/libapp.a \
$(top_builddir)/app/gegl/libappgegl.a \
+ $(top_builddir)/app/operations/libappoperations.a \
libgimpapptestutils.a \
+ $(libgimp) \
$(libgimpwidgets) \
$(libgimpconfig) \
$(libgimpmath) \
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index d99d0cd..823c578 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -5,7 +5,7 @@ libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
-libgimp = ./libgimp-$(GIMP_API_VERSION).la
+libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
if PLATFORM_WIN32
no_undefined = -no-undefined
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]