gimp r28017 - in trunk: . plug-ins/file-faxg3 plug-ins/help plug-ins/metadata
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r28017 - in trunk: . plug-ins/file-faxg3 plug-ins/help plug-ins/metadata
- Date: Thu, 12 Feb 2009 20:35:21 +0000 (UTC)
Author: mitch
Date: Thu Feb 12 20:35:21 2009
New Revision: 28017
URL: http://svn.gnome.org/viewvc/gimp?rev=28017&view=rev
Log:
2009-02-12 Michael Natterer <mitch gimp org>
* plug-ins/file-faxg3/Makefile.am
* plug-ins/help/Makefile.am
* plug-ins/metadata/Makefile.am: add $(libgimpconfig) to LDADD
where it was missing. Libgimp pulls in libgimpconfig and these
plug-ins were linking against the installed libgimpconfig under
some #$&%*#%&%$& .la file circumstances.
Modified:
trunk/ChangeLog
trunk/plug-ins/file-faxg3/Makefile.am
trunk/plug-ins/help/Makefile.am
trunk/plug-ins/metadata/Makefile.am
Modified: trunk/plug-ins/file-faxg3/Makefile.am
==============================================================================
--- trunk/plug-ins/file-faxg3/Makefile.am (original)
+++ trunk/plug-ins/file-faxg3/Makefile.am Thu Feb 12 20:35:21 2009
@@ -29,10 +29,11 @@
-I$(includedir)
LDADD = \
- $(libgimp) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(libgimpmath) \
- $(GLIB_LIBS) \
- $(RT_LIBS) \
+ $(libgimp) \
+ $(libgimpconfig) \
+ $(libgimpcolor) \
+ $(libgimpbase) \
+ $(libgimpmath) \
+ $(GLIB_LIBS) \
+ $(RT_LIBS) \
$(INTLLIBS)
Modified: trunk/plug-ins/help/Makefile.am
==============================================================================
--- trunk/plug-ins/help/Makefile.am (original)
+++ trunk/plug-ins/help/Makefile.am Thu Feb 12 20:35:21 2009
@@ -2,6 +2,7 @@
libgimphelp = libgimphelp.a
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
@@ -42,13 +43,14 @@
-I$(includedir)
LDADD = \
- $(libgimphelp) \
- $(libgimp) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(libgimpmath) \
- $(GIO_LIBS) \
- $(RT_LIBS) \
+ $(libgimphelp) \
+ $(libgimp) \
+ $(libgimpconfig) \
+ $(libgimpcolor) \
+ $(libgimpbase) \
+ $(libgimpmath) \
+ $(GIO_LIBS) \
+ $(RT_LIBS) \
$(INTLLIBS)
Modified: trunk/plug-ins/metadata/Makefile.am
==============================================================================
--- trunk/plug-ins/metadata/Makefile.am (original)
+++ trunk/plug-ins/metadata/Makefile.am Thu Feb 12 20:35:21 2009
@@ -3,6 +3,7 @@
libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
@@ -54,12 +55,13 @@
-I$(includedir)
LDADD = \
- $(libgimp) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(libgimpmath) \
- $(GTK_LIBS) \
- $(RT_LIBS) \
+ $(libgimp) \
+ $(libgimpconfig) \
+ $(libgimpcolor) \
+ $(libgimpbase) \
+ $(libgimpmath) \
+ $(GTK_LIBS) \
+ $(RT_LIBS) \
$(INTLLIBS)
# test program, not built by default
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]