libextractor

commit 96de4918cb78e3e36b0fb19027fb084c1b14a804
parent de6b2942271ca1ae47d1bd101cc26f626d2ba3fa
Author: Nils Durner <durner@gnunet.org>
Date:   Tue,  4 Nov 2008 19:15:10 +0000

fix 
	../../libtool: eval: line 1: syntax error near unexpected token `|'
on MinGW

Diffstat:
M
src/main/Makefile.am
 | 
11
+++++++----
M
src/plugins/Makefile-plugins.am
 | 
5
++++-

2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
@@ -17,9 +17,12 @@ extract_LDADD = \
   $(top_builddir)/src/main/libextractor.la 
 
 if !MINGW
-if !SOMEBSD
-  dlflag=-ldl
-endif
+  exportflag=-export-symbols-regex "EXTRACTOR_[a-zA-Z0-9_]*"
+  if !SOMEBSD
+    dlflag=-ldl
+  endif
+else
+  winexportflag=-export-dynamic
 endif
 
 if HAVE_ZLIB
@@ -36,7 +39,7 @@ endif
 endif
 
 libextractor_la_LDFLAGS = \
-  -export-dynamic -export-symbols-regex "EXTRACTOR_[a-zA-Z0-9_]*" -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ $(LIBICONV)
+  $(exportflag) $(winexportflag) -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ $(LIBICONV)
 libextractor_la_LIBADD = \
   $(LIBLTDL) $(dlflag) $(zlib) $(bz2lib) $(GSF_LIBS_X) -lpthread
 libextractor_la_DEPENDENCIES = \
diff --git a/src/plugins/Makefile-plugins.am b/src/plugins/Makefile-plugins.am
@@ -6,10 +6,13 @@ plugindir = $(libdir)/@RPLUGINDIR@
 LIBS = \
  @LTLIBINTL@ @LIBS@
 
+if !MINGW
+  retaincommand=-export-symbols-regex "libextractor_[a-zA-Z0-9_]*_extract"
+endif
+
 if HAVE_GNU_LD
  makesymbolic=-Wl,-Bsymbolic
 endif
-retaincommand=-export-symbols-regex "libextractor_[a-zA-Z0-9_]*_extract"
 
 PLUGINFLAGS = $(makesymbolic) -avoid-version -module -no-undefined