Merged trunk changes r9797:9829 into 217update branch.
--- librsvg-2.14.0/Makefile.am.orig 2006-02-28 17:50:48.058903000 -0500
+++ librsvg-2.14.0/Makefile.am 2006-02-28 18:04:29.231045000 -0500
@@ -16,10 +16,17 @@
man_MANS = rsvg.1
if OS_WIN32
+export_symbols = -export-symbols $(srcdir)/librsvg.def
else
+export_symbols = -export-symbols $(srcdir)/librsvg.symbols
+$(lib_LTLIBRARIES): librsvg.symbols
+
libm = -lm
endif
+librsvg.symbols: librsvg.def
+ grep -v '^EXPORTS$$' librsvg.def > librsvg.symbols
+
headers = \
rsvg.h \
rsvg-cairo.h
@@ -72,7 +79,7 @@
rsvg-gobject.c \
rsvg-file-util.c
-librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@ -export-dynamic -no-undefined -export-symbols $(srcdir)/librsvg.def
+librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@ -export-dynamic -no-undefined $(export_symbols)
librsvg_2_la_LIBADD = $(LIBGNOME_VFS_LIBS) $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS) $(FREETYPE_LIBS)
librsvgincdir = $(includedir)/librsvg-2/librsvg
@@ -139,7 +146,8 @@
CLEANFILES = \
$(enum_sources) \
- s-enum-types-h s-enum-types-c
+ s-enum-types-h s-enum-types-c \
+ librsvg.symbols
## Put `exec' in the name because this should be installed by
## `install-exec', not `install-data'.