callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Fix the location of the libm dependency

Browse Source 
The plug-ins use symbols in libm and that's why -lm is necessary, not
because libgimpmath uses it.
This commit is contained in:
Mukund Sivaraman
2011-12-12 23:40:55 +05:30
parent 49057bcbad
commit 1808e4cbc3
12 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plug-ins/color-rotate/Makefile.am
View File

@ -12,7 +12,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
include $(top_srcdir)/build/windows/gimprc-plug-ins.rule include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
@ -47,6 +47,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/flame/Makefile.am
View File

@ -12,7 +12,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
include $(top_srcdir)/build/windows/gimprc-plug-ins.rule include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
@ -43,6 +43,7 @@ INCLUDES = \
EXTRA_DIST = README EXTRA_DIST = README
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/fractal-explorer/Makefile.am
View File

@ -12,7 +12,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
include $(top_srcdir)/build/windows/gimprc-plug-ins.rule include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
@ -39,6 +39,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/gfig/Makefile.am
View File

@ -12,7 +12,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
include $(top_srcdir)/build/windows/gimprc-plug-ins.rule include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
@ -70,6 +70,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/gimpressionist/Makefile.am
View File

@ -12,7 +12,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
SUBDIRS = Brushes Paper Presets SUBDIRS = Brushes Paper Presets
@ -70,6 +70,7 @@ gimpressionist_SOURCES = \
utils.c utils.c
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/gradient-flare/Makefile.am
View File

@ -12,7 +12,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
include $(top_srcdir)/build/windows/gimprc-plug-ins.rule include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
@ -35,6 +35,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/ifs-compose/Makefile.am
View File

@ -12,7 +12,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
include $(top_srcdir)/build/windows/gimprc-plug-ins.rule include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
@ -39,6 +39,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/imagemap/Makefile.am
View File

@ -12,7 +12,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
include $(top_srcdir)/build/windows/gimprc-plug-ins.rule include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
@ -137,6 +137,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/lighting/Makefile.am
View File

@ -12,7 +12,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la $(libm) libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
include $(top_srcdir)/build/windows/gimprc-plug-ins.rule include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
@ -49,6 +49,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/map-object/Makefile.am
View File

@ -11,7 +11,7 @@ libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
@ -49,6 +49,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/pagecurl/Makefile.am
View File

@ -11,7 +11,7 @@ libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
@ -40,6 +40,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \

3
plug-ins/selection-to-path/Makefile.am
View File

@ -12,7 +12,7 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
if HAVE_WINDRES if HAVE_WINDRES
include $(top_srcdir)/build/windows/gimprc-plug-ins.rule include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
@ -57,6 +57,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
LDADD = \ LDADD = \
$(libm) \
$(libgimpui) \ $(libgimpui) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpconfig) \ $(libgimpconfig) \