From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 21 Oct 2009 19:04:52 +0000 (+0300)
Subject: Use dbus-1.def on Windows
X-Git-Tag: dbus-1.3.1~156
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=861989a35d4aa04502c836ecd572cb7e4a61426a;p=thirdparty%2Fdbus.git

Use dbus-1.def on Windows
---

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index c85556a5a..4346de73b 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -38,7 +38,9 @@ else
 dbus_res =
 dbus_res_ldflag =
 no_undefined =
-export_symbols =
+## don't export symbols that start with "_" (we use this
+## convention for internal symbols)
+export_symbols = -export-symbols-regex "^[^_].*"
 install-def-file:
 uninstall-def-file:
 
@@ -238,9 +240,7 @@ EXTRA_DIST=dbus-arch-deps.h.in
 noinst_LTLIBRARIES=libdbus-convenience.la
 
 libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS)
-## don't export symbols that start with "_" (we use this 
-## convention for internal symbols)
-libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@ @PIC_LDFLAGS@
+libdbus_1_la_LDFLAGS= $(export_symbols) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@ @PIC_LDFLAGS@
 
 libdbus_convenience_la_LDFLAGS=@R_DYNAMIC_LDFLAG@