X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_freetype%2FMakefile.am;h=4528b36085807b3b90decbd961f61ad97b5a0309;hb=56f5b6b1728428492dc91a1551cd5efe240727ee;hp=531accec5cb30630f1b9187fa69ddc8502ffb5bb;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;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 531acce..4528b36 100644
--- a/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am
+++ b/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am
@@ -1,18 +1,24 @@
-# $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@
+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 @SYNFIG_LIBS@
-liblyr_freetype_la_LDFLAGS = -module @FREETYPE_LIBS@ -no-undefined
+liblyr_freetype_la_LIBADD = -L../../synfig -lsynfig @FREETYPE_LIBS@ @SYNFIG_LIBS@
+liblyr_freetype_la_LDFLAGS = -module -no-undefined
 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