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

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

diff --git a/synfig-core/tags/stable/src/modules/mod_geometry/Makefile.am b/synfig-core/tags/stable/src/modules/mod_geometry/Makefile.am
index 3d5f33f..187403f 100644 (file)
--- a/synfig-core/tags/stable/src/modules/mod_geometry/Makefile.am
+++ b/synfig-core/tags/stable/src/modules/mod_geometry/Makefile.am
@@ -2,7 +2,7 @@
 
 
 MAINTAINERCLEANFILES=Makefile.in
-INCLUDES = -I$(top_srcdir)/src
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
 
 # GCC on MacOS X does not take kindly to the -ffastmath optimization
 # in this module for some reason.
@@ -13,6 +13,6 @@ moduledir=@MODULE_DIR@
 module_LTLIBRARIES = libmod_geometry.la
 libmod_geometry_la_SOURCES = rectangle.cpp rectangle.h star.h star.cpp checkerboard.cpp checkerboard.h circle.cpp circle.h region.h region.cpp outline.h outline.cpp main.cpp 
 libmod_geometry_la_CXXFLAGS = @SYNFIG_CFLAGS@
-libmod_geometry_la_LIBADD = -L../../synfig -lsynfig @SYNFIG_LIBS@
-libmod_geometry_la_LDFLAGS = -module -no-undefined
+libmod_geometry_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@
+libmod_geometry_la_LDFLAGS = -module -no-undefined -avoid-version
 EXTRA_DIST= mod_geometry.nsh unmod_geometry.nsh