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 86ecee2..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,18 +1,24 @@
-# $Header: /opt/voria/cvs/sinfg/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../../sinfg -lsinfg @SINFG_LIBS@
-liblyr_freetype_la_LDFLAGS = -module @FREETYPE_LIBS@ -no-undefined
-liblyr_freetype_la_CXXFLAGS = @SINFG_CFLAGS@ @FREETYPE_CFLAGS@
+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
 
 
+EXTRA_DIST= lyr_freetype.nsh unlyr_freetype.nsh