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

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

diff --git a/synfig-core/tags/stable/src/modules/lyr_freetype/Makefile.am b/synfig-core/tags/stable/src/modules/lyr_freetype/Makefile.am
index 4528b36..069a66e 100644 (file)
--- a/synfig-core/tags/stable/src/modules/lyr_freetype/Makefile.am
+++ b/synfig-core/tags/stable/src/modules/lyr_freetype/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES = -I$(top_srcdir)/src
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
 AM_CXXFLAGS=@CXXFLAGS@ @FREETYPE_CFLAGS@
 
 moduledir=@MODULE_DIR@
@@ -9,8 +9,8 @@ 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_LDFLAGS = -module -no-undefined
+liblyr_freetype_la_LIBADD = ../../synfig/libsynfig.la @FREETYPE_LIBS@ @SYNFIG_LIBS@
+liblyr_freetype_la_LDFLAGS = -module -no-undefined -avoid-version
 liblyr_freetype_la_CXXFLAGS = @SYNFIG_CFLAGS@ @FREETYPE_CFLAGS@
 if WITH_FONTCONFIG
 liblyr_freetype_la_LIBADD += @FONTCONFIG_LIBS@