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

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

diff --git a/synfig-core/tags/stable/src/modules/mod_libavcodec/Makefile.am b/synfig-core/tags/stable/src/modules/mod_libavcodec/Makefile.am
index 1453b1f..193e321 100644 (file)
--- a/synfig-core/tags/stable/src/modules/mod_libavcodec/Makefile.am
+++ b/synfig-core/tags/stable/src/modules/mod_libavcodec/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 WITH_LIBAVCODEC
 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_LDFLAGS = -module -no-undefined -avoid-version
+libmod_libavcodec_la_CXXFLAGS = @SYNFIG_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ -D__STDC_CONSTANT_MACROS
+libmod_libavcodec_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@
 else
 endif
 EXTRA_DIST= mod_libavcodec.nsh unmod_libavcodec.nsh