Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / modules / mod_jpeg / Makefile.am

diff --git a/synfig-core/tags/stable/src/modules/mod_jpeg/Makefile.am b/synfig-core/tags/stable/src/modules/mod_jpeg/Makefile.am
index 1225d1d..6e91c06 100644 (file)
--- a/synfig-core/tags/stable/src/modules/mod_jpeg/Makefile.am
+++ b/synfig-core/tags/stable/src/modules/mod_jpeg/Makefile.am
@@ -2,16 +2,16 @@
 
 
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES = -I$(top_srcdir)/src
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
 
 moduledir=@MODULE_DIR@
 
 if HAVE_LIBJPEG
 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_LDFLAGS = -module @JPEG_LIBS@ -no-undefined -avoid-version
 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