X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_freetype%2FMakefile.am;h=a778e78905dd1f490d3e052f2523c4f5b118ba7a;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=dc42fdf4adae6865db09946944f1006858cae1ac;hpb=16b3beced25134bef064705568ecb893a6be4e79;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 dc42fdf..a778e78 100644
--- a/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am
+++ b/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am
@@ -1,18 +1,49 @@
-# $Header: /opt/voria/cvs/sinfg/src/modules/lyr_freetype/Makefile.am,v 1.2 2005/01/16 19:54:09 darco Exp $
+# $Id$
+
+MAINTAINERCLEANFILES = Makefile.in
+
+INCLUDES = \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/src
+
+AM_CXXFLAGS = \
+	@CXXFLAGS@ \
+	@FREETYPE_CFLAGS@
 
-MAINTAINERCLEANFILES=Makefile.in
-INCLUDES = -I$(top_srcdir)/src
-CXXFLAGS=@CXXFLAGS@ @FT2_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 @FT2_LIBS@ -no-undefined
-liblyr_freetype_la_CXXFLAGS = @SINFG_CFLAGS@
-else
+
+liblyr_freetype_la_SOURCES = \
+	main.cpp \
+	lyr_freetype.cpp \
+	lyr_freetype.h
+
+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@
+endif
+
 endif
 
 
+EXTRA_DIST = \
+	lyr_freetype.nsh \
+	unlyr_freetype.nsh