X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_freetype%2FMakefile.am;h=069a66e838cecef3b8d6602af66b5fa3e3f636e5;hb=a93e9a8c03f239eb067331491d3a276c696b27ea;hp=c48daff7b28f3fdf49a93b0d63da8d616ae59052;hpb=4feb365a7315fbd850d9b300984d372710ee759d;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am b/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am
index c48daff..069a66e 100644
--- a/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am
+++ b/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am
@@ -1,17 +1,22 @@
-# $Header: /opt/voria/cvs/synfig/src/modules/lyr_freetype/Makefile.am,v 1.3 2005/03/24 21:07:24 darco Exp $
+# $Id$
 
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES = -I$(top_srcdir)/src
-CXXFLAGS=@CXXFLAGS@ @FREETYPE_CFLAGS@
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
+AM_CXXFLAGS=@CXXFLAGS@ @FREETYPE_CFLAGS@
 
 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@
+liblyr_freetype_la_CXXFLAGS += @FONTCONFIG_CFLAGS@
+else
+endif
 else
 endif