--- libextractor-0.4.0/src/plugins/ole2/Makefile.am	2004-12-25 16:43:41 +0300
+++ libextractor-0.4.0/src/plugins/ole2/Makefile.am.fixed	2005-01-16 23:56:14 +0300
@@ -16,16 +16,16 @@
 
 libextractor_ole2_la_CFLAGS = \
   $(GLIB_CFLAGS)
+
 libextractor_ole2_la_LIBADD = \
   $(LIBADD) $(GLIB_LIBS) $(WINFLAGS) \
   $(top_builddir)/src/main/libextractor.la
-# Ok, linking this one is complicated, see Mantis #787.
-libextractor_ole2_la_LDFLAGS = \
-  -Wl,-Bstatic -Wl,-lgobject-2.0 -Wl,-lglib-2.0 -Wl,-Bdynamic \
-  -Wl,-Bsymbolic -avoid-version -module
-# Note that we're NOT using PLUGINFLAGS here to avoid -export-dynamic!
+
+libextractor_ole2_la_LDFLAGS = $(PLUGINFLAGS) \
+	$(GLIB_LIBS) -lgobject-2.0 $(top_builddir)/src/main/libextractor.la
+
 libextractor_ole2_la_SOURCES =  \
-        ole2extractor.c         \
+	ole2extractor.c         \
 	gsf.h			\
 	gsf-utils.c		\
 	gsf-utils.h		\