summaryrefslogtreecommitdiffstats
path: root/lasso/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'lasso/Makefile.am')
-rw-r--r--lasso/Makefile.am22
1 files changed, 21 insertions, 1 deletions
diff --git a/lasso/Makefile.am b/lasso/Makefile.am
index d3344f26..aa2f2d82 100644
--- a/lasso/Makefile.am
+++ b/lasso/Makefile.am
@@ -14,6 +14,16 @@ INCLUDES = \
EXTRA_DIST = \
$(NULL)
+## Added to activate libtool 1.5.6 windows resources partial support
+LTRCCOMPILE = $(LIBTOOL) --tag=RC --mode=compile $(RC) \
+ `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) |\
+ sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
+
+## Added to activate libtool 1.5.6 windows resources partial support
+lasso.rc.lo: ../win32/lasso.rc
+ $(LTRCCOMPILE) -i $< -o $@
+
+
lib_LTLIBRARIES = \
liblasso.la \
$(NULL)
@@ -28,13 +38,23 @@ liblasso_la_SOURCES = \
lasso.c \
$(NULL)
+if MINGW
+liblasso_la_LIBADD = \
+ $(top_builddir)/lasso/xml/liblasso-xml.la \
+ $(top_builddir)/lasso/protocols/liblasso-protocols.la \
+ $(top_builddir)/lasso/environs/liblasso-environs.la \
+ $(LASSO_LIBS) \
+ lasso.rc.lo \
+ $(NULL)
+else
liblasso_la_LIBADD = \
$(top_builddir)/lasso/xml/liblasso-xml.la \
$(top_builddir)/lasso/protocols/liblasso-protocols.la \
$(top_builddir)/lasso/environs/liblasso-environs.la \
$(LASSO_LIBS) \
$(NULL)
+endif
liblasso_la_LDFLAGS = \
- -version-info @LASSO_VERSION_INFO@ \
+ -no-undefined -version-info @LASSO_VERSION_INFO@ \
$(NULL)