[libchamplain/libchamplain-0-2: 11/12] -export-symbols-regex was set in AM_LDFLAGS, but this got overridden by



commit 9193a18de985c02879c0d9fc8c4c035df0a617bc
Author: Sjoerd Simons <sjoerd luon net>
Date:   Thu Apr 2 02:54:21 2009 +0300

    -export-symbols-regex was set in AM_LDFLAGS, but this got overridden by
    libchamplain_0_2_la_LDFLAGS causing it to not actually have any effect :(. Fix
    this by putting -export-symbols-regex in libchamplain_0_2_la_LDFLAGS and
    removing the useless AM_LDFLAGS.
---
 champlain/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index f52fe53..98e48c6 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -51,9 +51,9 @@ champlain-marshal.c: $(CHAMPLAIN_MARSHAL_LIST)
 libchamplain_includedir=$(includedir)/libchamplain-0.2/champlain
 libchamplain_include_HEADERS = champlain.h champlainview.h champlaindefines.h champlainlayer.h champlainmarker.h
 
-libchamplain_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
+libchamplain_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION) \
+    -export-symbols-regex '^champlain_'
 
 AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir)/tidy -I$(top_srcdir) -DCHAMPLAIN_COMPILATION
-AM_LDFLAGS = $(DEPS_LIBS) -export-symbols-regex ^champlain_.*
 
 EXTRA_DIST = $(CHAMPLAIN_MARSHAL_LIST)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]