Fix 1862689: Replace "-L../../synfig -lsynfig" with "../../synfig/libsynfig.la" in...

git-svn-id: http://svn.voria.com/code@1259 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am b/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am
index 42a69e2..b1cfff7 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am
+++ b/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am
@@ -9,7 +9,7 @@ moduledir=@MODULE_DIR@
 if WITH_FREETYPE
 module_LTLIBRARIES = liblyr_freetype.la
 liblyr_freetype_la_SOURCES = main.cpp lyr_freetype.cpp lyr_freetype.h
-liblyr_freetype_la_LIBADD = -L../../synfig -lsynfig @FREETYPE_LIBS@ @SYNFIG_LIBS@
+liblyr_freetype_la_LIBADD = ../../synfig/libsynfig.la @FREETYPE_LIBS@ @SYNFIG_LIBS@
 liblyr_freetype_la_LDFLAGS = -module -no-undefined
 liblyr_freetype_la_CXXFLAGS = @SYNFIG_CFLAGS@ @FREETYPE_CFLAGS@
 if WITH_FONTCONFIG

diff --git a/synfig-core/trunk/src/modules/lyr_std/Makefile.am b/synfig-core/trunk/src/modules/lyr_std/Makefile.am
index 12e5aea..afc2cd2 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/Makefile.am
+++ b/synfig-core/trunk/src/modules/lyr_std/Makefile.am
@@ -9,6 +9,6 @@ moduledir=@MODULE_DIR@
 module_LTLIBRARIES = liblyr_std.la
 liblyr_std_la_SOURCES = main.cpp timeloop.cpp timeloop.h warp.cpp warp.h xorpattern.cpp booleancurve.h booleancurve.cpp bevel.cpp bevel.h shade.cpp shade.h twirl.cpp twirl.h stretch.cpp stretch.h xorpattern.h clamp.cpp clamp.h supersample.cpp supersample.h insideout.cpp insideout.h julia.cpp julia.h rotate.cpp rotate.h mandelbrot.cpp mandelbrot.h zoom.h zoom.cpp import.cpp import.h translate.h translate.cpp sphere_distort.h sphere_distort.cpp
 liblyr_std_la_CXXFLAGS = @SYNFIG_CFLAGS@
-liblyr_std_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+liblyr_std_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 liblyr_std_la_LDFLAGS = -module -no-undefined
 EXTRA_DIST= lyr_std.nsh unlyr_std.nsh

diff --git a/synfig-core/trunk/src/modules/mod_bmp/Makefile.am b/synfig-core/trunk/src/modules/mod_bmp/Makefile.am
index f893a35..d99d23a 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_bmp/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_bmp/Makefile.am
@@ -10,5 +10,5 @@ module_LTLIBRARIES = libmod_bmp.la
 libmod_bmp_la_SOURCES = main.cpp trgt_bmp.cpp trgt_bmp.h mptr_bmp.cpp mptr_bmp.h
 libmod_bmp_la_LDFLAGS = -module -no-undefined
 libmod_bmp_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_bmp_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_bmp_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 EXTRA_DIST= mod_bmp.nsh unmod_bmp.nsh

diff --git a/synfig-core/trunk/src/modules/mod_dv/Makefile.am b/synfig-core/trunk/src/modules/mod_dv/Makefile.am
index 62b38fc..e6a0da2 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_dv/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_dv/Makefile.am
@@ -11,7 +11,7 @@ module_LTLIBRARIES = libmod_dv.la
 libmod_dv_la_SOURCES = main.cpp trgt_dv.cpp trgt_dv.h
 libmod_dv_la_LDFLAGS = -module -no-undefined
 libmod_dv_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_dv_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_dv_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 else
 endif
 EXTRA_DIST= mod_dv.nsh unmod_dv.nsh

diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am b/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am
index 6b7540a..be35fb2 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am
@@ -11,7 +11,7 @@ module_LTLIBRARIES = libmod_ffmpeg.la
 libmod_ffmpeg_la_SOURCES = main.cpp mptr_ffmpeg.cpp mptr_ffmpeg.h trgt_ffmpeg.cpp trgt_ffmpeg.h
 libmod_ffmpeg_la_LDFLAGS = -module -no-undefined
 libmod_ffmpeg_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_ffmpeg_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_ffmpeg_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 else
 endif
 

diff --git a/synfig-core/trunk/src/modules/mod_filter/Makefile.am b/synfig-core/trunk/src/modules/mod_filter/Makefile.am
index eae27c1..570d276 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_filter/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_filter/Makefile.am
@@ -9,6 +9,6 @@ moduledir=@MODULE_DIR@
 module_LTLIBRARIES = libmod_filter.la
 libmod_filter_la_SOURCES = blur.cpp blur.h colorcorrect.cpp colorcorrect.h halftone2.cpp halftone2.h lumakey.cpp lumakey.h radialblur.cpp radialblur.h main.cpp halftone.cpp halftone.h halftone3.cpp halftone3.h
 libmod_filter_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_filter_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_filter_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 libmod_filter_la_LDFLAGS = -module -no-undefined
 EXTRA_DIST= mod_filter.nsh unmod_filter.nsh

diff --git a/synfig-core/trunk/src/modules/mod_geometry/Makefile.am b/synfig-core/trunk/src/modules/mod_geometry/Makefile.am
index eebcbed..2d3f0a2 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_geometry/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_geometry/Makefile.am
@@ -13,6 +13,6 @@ moduledir=@MODULE_DIR@
 module_LTLIBRARIES = libmod_geometry.la
 libmod_geometry_la_SOURCES = rectangle.cpp rectangle.h star.h star.cpp checkerboard.cpp checkerboard.h circle.cpp circle.h region.h region.cpp outline.h outline.cpp main.cpp 
 libmod_geometry_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_geometry_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_geometry_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 libmod_geometry_la_LDFLAGS = -module -no-undefined
 EXTRA_DIST= mod_geometry.nsh unmod_geometry.nsh

diff --git a/synfig-core/trunk/src/modules/mod_gif/Makefile.am b/synfig-core/trunk/src/modules/mod_gif/Makefile.am
index 27f9dc7..41aaaba 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_gif/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_gif/Makefile.am
@@ -10,5 +10,5 @@ module_LTLIBRARIES = libmod_gif.la
 libmod_gif_la_SOURCES = main.cpp trgt_gif.cpp trgt_gif.h
 libmod_gif_la_LDFLAGS = -module -no-undefined
 libmod_gif_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_gif_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_gif_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 EXTRA_DIST= mod_gif.nsh unmod_gif.nsh

diff --git a/synfig-core/trunk/src/modules/mod_gradient/Makefile.am b/synfig-core/trunk/src/modules/mod_gradient/Makefile.am
index 475ed7f..4a14725 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_gradient/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_gradient/Makefile.am
@@ -9,6 +9,6 @@ moduledir=@MODULE_DIR@
 module_LTLIBRARIES = libmod_gradient.la
 libmod_gradient_la_SOURCES = curvegradient.cpp curvegradient.h  lineargradient.cpp lineargradient.h conicalgradient.cpp conicalgradient.h spiralgradient.cpp spiralgradient.h radialgradient.cpp radialgradient.h main.cpp
 libmod_gradient_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_gradient_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_gradient_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 libmod_gradient_la_LDFLAGS = -module -no-undefined
 EXTRA_DIST= mod_gradient.nsh unmod_gradient.nsh

diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am b/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am
index 61bf550..7210bab 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am
@@ -11,7 +11,7 @@ module_LTLIBRARIES = libmod_imagemagick.la
 libmod_imagemagick_la_SOURCES = main.cpp mptr_imagemagick.cpp mptr_imagemagick.h trgt_imagemagick.cpp trgt_imagemagick.h
 libmod_imagemagick_la_LDFLAGS = -module -no-undefined
 libmod_imagemagick_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_imagemagick_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_imagemagick_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 else
 endif
 

diff --git a/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am b/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am
index e2bb861..5062fdd 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am
@@ -11,7 +11,7 @@ module_LTLIBRARIES = libmod_jpeg.la
 libmod_jpeg_la_SOURCES = main.cpp trgt_jpeg.cpp trgt_jpeg.h mptr_jpeg.cpp mptr_jpeg.h
 libmod_jpeg_la_LDFLAGS = -module @JPEG_LIBS@ -no-undefined
 libmod_jpeg_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_jpeg_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_jpeg_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 else
 endif
 EXTRA_DIST= mod_jpeg.nsh unmod_jpeg.nsh

diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am b/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am
index f3b75ff..520fe1d 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am
@@ -11,7 +11,7 @@ module_LTLIBRARIES = libmod_libavcodec.la
 libmod_libavcodec_la_SOURCES = main.cpp trgt_av.cpp trgt_av.h mptr.cpp mptr.h
 libmod_libavcodec_la_LDFLAGS = -module -no-undefined
 libmod_libavcodec_la_CXXFLAGS = @SYNFIG_CFLAGS@ @LIBAVCODEC_CFLAGS@ -D__STDC_CONSTANT_MACROS
-libmod_libavcodec_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ @LIBAVCODEC_LIBS@
+libmod_libavcodec_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ @LIBAVCODEC_LIBS@
 else
 endif
 EXTRA_DIST= mod_libavcodec.nsh unmod_libavcodec.nsh 

diff --git a/synfig-core/trunk/src/modules/mod_magickpp/Makefile.am b/synfig-core/trunk/src/modules/mod_magickpp/Makefile.am
index 1b22fe6..465208c 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_magickpp/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_magickpp/Makefile.am
@@ -10,7 +10,7 @@ module_LTLIBRARIES = libmod_magickpp.la
 libmod_magickpp_la_SOURCES = main.cpp trgt_magickpp.cpp trgt_magickpp.h
 libmod_magickpp_la_LDFLAGS = -module @MAGICKPP_LIBS@ -no-undefined
 libmod_magickpp_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_magickpp_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_magickpp_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 else
 endif
 EXTRA_DIST= mod_magickpp.nsh unmod_magickpp.nsh

diff --git a/synfig-core/trunk/src/modules/mod_mng/Makefile.am b/synfig-core/trunk/src/modules/mod_mng/Makefile.am
index e07efd7..7be763e 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_mng/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_mng/Makefile.am
@@ -10,7 +10,7 @@ module_LTLIBRARIES = libmod_mng.la
 libmod_mng_la_SOURCES = main.cpp trgt_mng.cpp trgt_mng.h
 libmod_mng_la_LDFLAGS = -module @MNG_LIBS@ -no-undefined
 libmod_mng_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_mng_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_mng_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 else
 endif
 EXTRA_DIST= mod_mng.nsh unmod_mng.nsh

diff --git a/synfig-core/trunk/src/modules/mod_noise/Makefile.am b/synfig-core/trunk/src/modules/mod_noise/Makefile.am
index bb45b40..3f52f53 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_noise/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_noise/Makefile.am
@@ -9,6 +9,6 @@ moduledir=@MODULE_DIR@
 module_LTLIBRARIES = libmod_noise.la
 libmod_noise_la_SOURCES = random.cpp random.h distort.cpp distort.h noise.cpp noise.h valuenode_random.cpp valuenode_random.h main.cpp
 libmod_noise_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_noise_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_noise_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 libmod_noise_la_LDFLAGS = -module -no-undefined
 EXTRA_DIST= mod_noise.nsh unmod_noise.nsh

diff --git a/synfig-core/trunk/src/modules/mod_openexr/Makefile.am b/synfig-core/trunk/src/modules/mod_openexr/Makefile.am
index cd781a3..d2f1588 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_openexr/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_openexr/Makefile.am
@@ -10,7 +10,7 @@ if WITH_OPENEXR
 module_LTLIBRARIES = libmod_openexr.la
 libmod_openexr_la_SOURCES = main.cpp mptr_openexr.cpp mptr_openexr.h trgt_openexr.cpp trgt_openexr.h
 libmod_openexr_la_LDFLAGS = -module @PNG_LIBS@ -no-undefined
-libmod_openexr_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@ @OPENEXR_LIBS@
+libmod_openexr_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ @OPENEXR_LIBS@
 libmod_openexr_la_CXXFLAGS = @SYNFIG_CFLAGS@ @OPENEXR_CFLAGS@
 else
 endif

diff --git a/synfig-core/trunk/src/modules/mod_particle/Makefile.am b/synfig-core/trunk/src/modules/mod_particle/Makefile.am
index dbe106a..e2473c1 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_particle/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_particle/Makefile.am
@@ -9,6 +9,6 @@ moduledir=@MODULE_DIR@
 module_LTLIBRARIES = libmod_particle.la
 libmod_particle_la_SOURCES = random.cpp random.h plant.cpp plant.h main.cpp 
 libmod_particle_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_particle_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_particle_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 libmod_particle_la_LDFLAGS = -module -no-undefined
 EXTRA_DIST= mod_particle.nsh unmod_particle.nsh

diff --git a/synfig-core/trunk/src/modules/mod_png/Makefile.am b/synfig-core/trunk/src/modules/mod_png/Makefile.am
index 41a5b9f..d6703e1 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_png/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_png/Makefile.am
@@ -11,7 +11,7 @@ module_LTLIBRARIES = libmod_png.la
 libmod_png_la_SOURCES = main.cpp trgt_png.cpp trgt_png.h mptr_png.cpp mptr_png.h
 libmod_png_la_LDFLAGS = -module @PNG_LIBS@ -no-undefined
 libmod_png_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_png_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_png_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 else
 endif
 EXTRA_DIST= mod_png.nsh unmod_png.nsh

diff --git a/synfig-core/trunk/src/modules/mod_ppm/Makefile.am b/synfig-core/trunk/src/modules/mod_ppm/Makefile.am
index b3898b8..d5cae99 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ppm/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_ppm/Makefile.am
@@ -11,5 +11,5 @@ module_LTLIBRARIES = libmod_ppm.la
 libmod_ppm_la_SOURCES = main.cpp trgt_ppm.cpp trgt_ppm.h mptr_ppm.cpp mptr_ppm.h # trgt_mpg.cpp trgt_mpg.h
 libmod_ppm_la_LDFLAGS = -module -no-undefined
 libmod_ppm_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_ppm_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_ppm_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 EXTRA_DIST= mod_ppm.nsh unmod_ppm.nsh

diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am b/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am
index 0409ea4..f53fecc 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am
+++ b/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am
@@ -10,5 +10,5 @@ module_LTLIBRARIES = libmod_yuv420p.la
 libmod_yuv420p_la_SOURCES = main.cpp trgt_yuv.cpp trgt_yuv.h
 libmod_yuv420p_la_LDFLAGS = -module -no-undefined
 libmod_yuv420p_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_yuv420p_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmod_yuv420p_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
 EXTRA_DIST= mod_yuv420p.nsh unmod_yuv420p.nsh

diff --git a/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am b/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am
index 08dcb80..51a78cf 100644 (file)
--- a/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am
+++ b/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am
@@ -9,7 +9,7 @@ moduledir=@MODULE_DIR@
 module_LTLIBRARIES = libmptr_mplayer.la
 libmptr_mplayer_la_SOURCES = main.cpp mptr_mplayer.cpp mptr_mplayer.h
 libmptr_mplayer_la_LDFLAGS = -module -no-undefined
-libmptr_mplayer_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
+libmptr_mplayer_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@