[GNUnet-SVN] r7941 - in GNUnet: . src/applications/advertising src/applications/bootstrap_http src/applications/chat/lib src/applications/chat/module src/applications/datastore src/applications/dht/module src/applications/dht/tools src/applications/dstore_mysql src/applications/dstore_sqlite src/applications/fragmentation src/applications/fs src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/gap src/applications/fs/lib src/applications/fs/namespace src/applications/fs/uritrack src/applications/getoption src/applications/hostlist src/applications/identity src/applications/kvstore_sqlite src/applications/pingpong src/applications/rpc src/applications/session src/applications/sqstore_mysql src/applications/sqstore_sqlite src/applications/state src/applications/stats src/applications/tbench src/applications/template src/applications/testing src/applications/topology_default src/applications/tracekit src/applications/traffic src/applications/transport src/applications/vpn src/libs/mysql src/server src/setup/cocoa src/setup/gtk src/setup/lib src/setup/ncurses src/setup/qt src/setup/text src/transports src/transports/upnp src/util src/util/crypto src/util/network

[gnunet]

Author: holindho
Date: 2008-11-17 08:48:09 -0700 (Mon, 17 Nov 2008)
New Revision: 7941

Modified:
   GNUnet/configure.ac
   GNUnet/src/applications/advertising/Makefile.am
   GNUnet/src/applications/bootstrap_http/Makefile.am
   GNUnet/src/applications/chat/lib/Makefile.am
   GNUnet/src/applications/chat/module/Makefile.am
   GNUnet/src/applications/datastore/Makefile.am
   GNUnet/src/applications/dht/module/Makefile.am
   GNUnet/src/applications/dht/tools/Makefile.am
   GNUnet/src/applications/dstore_mysql/Makefile.am
   GNUnet/src/applications/dstore_sqlite/Makefile.am
   GNUnet/src/applications/fragmentation/Makefile.am
   GNUnet/src/applications/fs/Makefile.am
   GNUnet/src/applications/fs/collection/Makefile.am
   GNUnet/src/applications/fs/ecrs/Makefile.am
   GNUnet/src/applications/fs/fsui/Makefile.am
   GNUnet/src/applications/fs/gap/Makefile.am
   GNUnet/src/applications/fs/lib/Makefile.am
   GNUnet/src/applications/fs/namespace/Makefile.am
   GNUnet/src/applications/fs/uritrack/Makefile.am
   GNUnet/src/applications/getoption/Makefile.am
   GNUnet/src/applications/hostlist/Makefile.am
   GNUnet/src/applications/identity/Makefile.am
   GNUnet/src/applications/kvstore_sqlite/Makefile.am
   GNUnet/src/applications/pingpong/Makefile.am
   GNUnet/src/applications/rpc/Makefile.am
   GNUnet/src/applications/session/Makefile.am
   GNUnet/src/applications/sqstore_mysql/Makefile.am
   GNUnet/src/applications/sqstore_sqlite/Makefile.am
   GNUnet/src/applications/state/Makefile.am
   GNUnet/src/applications/stats/Makefile.am
   GNUnet/src/applications/tbench/Makefile.am
   GNUnet/src/applications/template/Makefile.am
   GNUnet/src/applications/testing/Makefile.am
   GNUnet/src/applications/topology_default/Makefile.am
   GNUnet/src/applications/tracekit/Makefile.am
   GNUnet/src/applications/traffic/Makefile.am
   GNUnet/src/applications/transport/Makefile.am
   GNUnet/src/applications/vpn/Makefile.am
   GNUnet/src/libs/mysql/Makefile.am
   GNUnet/src/server/Makefile.am
   GNUnet/src/setup/cocoa/Makefile.am
   GNUnet/src/setup/gtk/Makefile.am
   GNUnet/src/setup/lib/Makefile.am
   GNUnet/src/setup/ncurses/Makefile.am
   GNUnet/src/setup/qt/Makefile.am
   GNUnet/src/setup/text/Makefile.am
   GNUnet/src/transports/Makefile.am
   GNUnet/src/transports/upnp/Makefile.am
   GNUnet/src/util/Makefile.am
   GNUnet/src/util/crypto/Makefile.am
   GNUnet/src/util/network/Makefile.am
Log:
LDFLAGS/LIBADD clean up, add -export-symbol-regex


Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/configure.ac 2008-11-17 15:48:09 UTC (rev 7941)
@@ -901,6 +901,26 @@
 AC_ARG_ENABLE(framework, [  --enable-framework      enable Mac OS X framework 
build helpers],enable_framework_build=$enableval)
 AM_CONDITIONAL(WANT_FRAMEWORK, test x$enable_framework_build = xyes)
 
+GN_LIB_LDFLAGS="-export-dynamic -no-undefined"
+GN_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined"
+dnl TODO insert a proper check here
+AC_CACHE_CHECK([whether -export-symbols-regex works],
+ gn_cv_export_symbols_regex_works, 
+ [
+  case "$host_os" in
+  mingw*) gn_cv_export_symbols_regex_works=no;;
+  *) gn_cv_export_symbols_regex_works=yes;;
+  esac
+ ])
+if test "x$gn_cv_export_symbols_regex_works" = "xyes"
+then
+ GN_LIB_LDFLAGS="$GN_LIB_LDFLAGS -export-symbols-regex 
\"GNUNET_@<:@a-zA-Z0-9_@:>@*\""
+ GN_PLUGIN_LDFLAGS="$GN_PLUGIN_LDFLAGS -export-symbols-regex 
\"@<:@a-zA-Z0-9_@:>@*\""
+fi
+AC_SUBST(GN_LIB_LDFLAGS)
+AC_SUBST(GN_PLUGIN_LDFLAGS)
+
+
 AC_SUBST(LIBPREFIX)
 AC_SUBST(DLLDIR)
 AC_SUBST(EXT_LIB_PATH)

Modified: GNUnet/src/applications/advertising/Makefile.am
===================================================================
--- GNUnet/src/applications/advertising/Makefile.am     2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/advertising/Makefile.am     2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -16,7 +16,7 @@
 libgnunetmodule_advertising_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la 
 libgnunetmodule_advertising_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+ $(GN_PLUGIN_LDFLAGS)
 
 
 

Modified: GNUnet/src/applications/bootstrap_http/Makefile.am
===================================================================
--- GNUnet/src/applications/bootstrap_http/Makefile.am  2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/bootstrap_http/Makefile.am  2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -14,7 +14,7 @@
 libgnunetmodule_bootstrap_la_LIBADD = @LIBCURL@ \
  $(top_builddir)/src/util/libgnunetutil.la 
 libgnunetmodule_bootstrap_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module 
+ $(GN_PLUGIN_LDFLAGS)
 libgnunetmodule_bootstrap_la_CPPFLAGS = \
  @LIBCURL_CPPFLAGS@ 
 

Modified: GNUnet/src/applications/chat/lib/Makefile.am
===================================================================
--- GNUnet/src/applications/chat/lib/Makefile.am        2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/chat/lib/Makefile.am        2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -12,6 +12,8 @@
 
 libgnunetchat_api_la_SOURCES = \
   messaging.c 
+libgnunetchat_api_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetchat_api_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 

Modified: GNUnet/src/applications/chat/module/Makefile.am
===================================================================
--- GNUnet/src/applications/chat/module/Makefile.am     2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/chat/module/Makefile.am     2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -17,5 +17,5 @@
 libgnunetmodule_chat_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunetmodule_chat_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 

Modified: GNUnet/src/applications/datastore/Makefile.am
===================================================================
--- GNUnet/src/applications/datastore/Makefile.am       2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/datastore/Makefile.am       2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -14,7 +14,7 @@
   prefetch.c prefetch.h \
   datastore.c 
 libgnunetmodule_datastore_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 libgnunetmodule_datastore_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la 
 

Modified: GNUnet/src/applications/dht/module/Makefile.am
===================================================================
--- GNUnet/src/applications/dht/module/Makefile.am      2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/dht/module/Makefile.am      2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -16,10 +16,10 @@
   table.c table.h 
 
 libgnunetmodule_dht_la_LIBADD = -lm \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/applications/rpc/libgnunetrpc_util.la
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/applications/rpc/libgnunetrpc_util.la
 libgnunetmodule_dht_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 
 
 

Modified: GNUnet/src/applications/dht/tools/Makefile.am
===================================================================
--- GNUnet/src/applications/dht/tools/Makefile.am       2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/dht/tools/Makefile.am       2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -14,6 +14,8 @@
   dht_api.c dht_api.h
 libgnunetdht_api_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la
+libgnunetdht_api_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 
 gnunet_dht_query_SOURCES = \
   dht-query.c

Modified: GNUnet/src/applications/dstore_mysql/Makefile.am
===================================================================
--- GNUnet/src/applications/dstore_mysql/Makefile.am    2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/dstore_mysql/Makefile.am    2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -27,7 +27,7 @@
 libgnunetmodule_dstore_mysql_la_SOURCES = \
   dstore_mysql.c 
 libgnunetmodule_dstore_mysql_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module \
+  $(GN_PLUGIN_LDFLAGS) \
   $(MYSQL_LDFLAGS)
 libgnunetmodule_dstore_mysql_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \

Modified: GNUnet/src/applications/dstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/dstore_sqlite/Makefile.am   2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/dstore_sqlite/Makefile.am   2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -23,11 +23,11 @@
 libgnunetmodule_dstore_sqlite_la_SOURCES = \
   dstore.c 
 libgnunetmodule_dstore_sqlite_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module \
+  $(GN_PLUGIN_LDFLAGS) \
   $(SQLITE_LDFLAGS)
 libgnunetmodule_dstore_sqlite_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
- -lsqlite3
+  $(top_builddir)/src/util/libgnunetutil.la \
+  -lsqlite3
 
 EXTRA_DIST = check.conf
 

Modified: GNUnet/src/applications/fragmentation/Makefile.am
===================================================================
--- GNUnet/src/applications/fragmentation/Makefile.am   2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/fragmentation/Makefile.am   2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -12,9 +12,9 @@
 libgnunetmodule_fragmentation_la_SOURCES = \
   fragmentation.c 
 libgnunetmodule_fragmentation_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la  
 libgnunetmodule_fragmentation_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 
 EXTRA_DIST = check.conf
 

Modified: GNUnet/src/applications/fs/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/Makefile.am      2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/fs/Makefile.am      2008-11-17 15:48:09 UTC (rev 
7941)
@@ -13,6 +13,8 @@
 
 libgnunetecrs_core_la_SOURCES = \
   ecrs_core.c
+libgnunetecrs_core_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetecrs_core_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la
 

Modified: GNUnet/src/applications/fs/collection/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/collection/Makefile.am   2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/fs/collection/Makefile.am   2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -11,9 +11,11 @@
 libgnunetcollection_la_SOURCES = \
   collection.c 
 libgnunetcollection_la_LIBADD = \
- $(top_builddir)/src/applications/fs/namespace/libgnunetnamespace.la \
- $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
- $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/applications/fs/namespace/libgnunetnamespace.la \
+  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
+libgnunetcollection_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 
 check_PROGRAMS = \
   collectiontest 

Modified: GNUnet/src/applications/fs/ecrs/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/ecrs/Makefile.am 2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/fs/ecrs/Makefile.am 2008-11-17 15:48:09 UTC (rev 
7941)
@@ -22,6 +22,8 @@
   unindex.c \
   upload.c \
   uri.c
+libgnunetecrs_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetecrs_la_LIBADD = \
  -lz \
  -lextractor \

Modified: GNUnet/src/applications/fs/fsui/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/fsui/Makefile.am 2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/fs/fsui/Makefile.am 2008-11-17 15:48:09 UTC (rev 
7941)
@@ -18,6 +18,8 @@
   serialize.c \
   unindex.c \
   upload.c
+libgnunetfsui_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
 libgnunetfsui_la_LIBADD = \
  -lextractor \
  $(top_builddir)/src/applications/identity/libgnunetidentity_api.la \

Modified: GNUnet/src/applications/fs/gap/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/gap/Makefile.am  2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/fs/gap/Makefile.am  2008-11-17 15:48:09 UTC (rev 
7941)
@@ -24,10 +24,11 @@
   shared.c shared.h 
 
 libgnunetmodule_fs_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module -lm
+  $(GN_PLUGIN_LDFLAGS)
 libgnunetmodule_fs_la_LIBADD = \
- $(top_builddir)/src/applications/fs/libgnunetecrs_core.la \
- $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/applications/fs/libgnunetecrs_core.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  -lm
 
 
 

Modified: GNUnet/src/applications/fs/lib/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/lib/Makefile.am  2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/fs/lib/Makefile.am  2008-11-17 15:48:09 UTC (rev 
7941)
@@ -10,6 +10,8 @@
 
 libgnunetfs_la_SOURCES = \
   fslib.c 
+libgnunetfs_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetfs_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/applications/fs/libgnunetecrs_core.la

Modified: GNUnet/src/applications/fs/namespace/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/namespace/Makefile.am    2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/fs/namespace/Makefile.am    2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -14,6 +14,8 @@
   root_info.c \
   update_info.c \
   uri.c 
+libgnunetnamespace_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetnamespace_la_LIBADD = \
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
  $(top_builddir)/src/util/libgnunetutil.la 

Modified: GNUnet/src/applications/fs/uritrack/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/uritrack/Makefile.am     2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/fs/uritrack/Makefile.am     2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -10,6 +10,8 @@
   file_info.c \
   uri_info.c \
   callbacks.c callbacks.h
+libgnuneturitrack_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnuneturitrack_la_LIBADD = \
  $(top_builddir)/src/applications/fs/ecrs/libgnunetecrs.la \
  $(top_builddir)/src/util/libgnunetutil.la 

Modified: GNUnet/src/applications/getoption/Makefile.am
===================================================================
--- GNUnet/src/applications/getoption/Makefile.am       2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/getoption/Makefile.am       2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -15,6 +15,8 @@
 
 libgnunetgetoption_api_la_SOURCES = \
   clientapi.c 
+libgnunetgetoption_api_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetgetoption_api_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 
@@ -23,4 +25,4 @@
 libgnunetmodule_getoption_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la
 libgnunetmodule_getoption_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)

Modified: GNUnet/src/applications/hostlist/Makefile.am
===================================================================
--- GNUnet/src/applications/hostlist/Makefile.am        2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/hostlist/Makefile.am        2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -18,7 +18,7 @@
 libgnunetmodule_hostlist_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la  -lmicrohttpd
 libgnunetmodule_hostlist_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 
 
 
@@ -37,4 +37,4 @@
 EXTRA_DIST = \
   check.conf \
   tcp-peer.conf \
-  nat-peer.conf
\ No newline at end of file
+  nat-peer.conf

Modified: GNUnet/src/applications/identity/Makefile.am
===================================================================
--- GNUnet/src/applications/identity/Makefile.am        2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/identity/Makefile.am        2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -21,11 +21,13 @@
 libgnunetmodule_identity_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la
 libgnunetmodule_identity_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 
 
 libgnunetidentity_api_la_SOURCES = \
   clientapi.c 
+libgnunetidentity_api_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetidentity_api_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 

Modified: GNUnet/src/applications/kvstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/kvstore_sqlite/Makefile.am  2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/kvstore_sqlite/Makefile.am  2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -21,7 +21,7 @@
 libgnunetmodule_kvstore_sqlite_la_SOURCES = \
   kv_sqlite.c 
 libgnunetmodule_kvstore_sqlite_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module \
+  $(GN_PLUGIN_LDFLAGS) \
   $(SQLITE_LDFLAGS)
 libgnunetmodule_kvstore_sqlite_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \

Modified: GNUnet/src/applications/pingpong/Makefile.am
===================================================================
--- GNUnet/src/applications/pingpong/Makefile.am        2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/pingpong/Makefile.am        2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -11,6 +11,6 @@
 libgnunetmodule_pingpong_la_SOURCES = \
   pingpong.c 
 libgnunetmodule_pingpong_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la 
 libgnunetmodule_pingpong_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)

Modified: GNUnet/src/applications/rpc/Makefile.am
===================================================================
--- GNUnet/src/applications/rpc/Makefile.am     2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/rpc/Makefile.am     2008-11-17 15:48:09 UTC (rev 
7941)
@@ -19,11 +19,12 @@
   $(top_builddir)/src/applications/rpc/libgnunetrpc_util.la
 
 libgnunetmodule_rpc_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 
 libgnunetrpc_util_la_SOURCES = \
   parameters.c 
-
+libgnunetrpc_util_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetrpc_util_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 

Modified: GNUnet/src/applications/session/Makefile.am
===================================================================
--- GNUnet/src/applications/session/Makefile.am 2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/session/Makefile.am 2008-11-17 15:48:09 UTC (rev 
7941)
@@ -12,9 +12,9 @@
   cache.c cache.h \
   connect.c 
 libgnunetmodule_session_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la 
 libgnunetmodule_session_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 
 if HAVE_MHD
   httptest = sessiontest_http sessiontest_nat_http

Modified: GNUnet/src/applications/sqstore_mysql/Makefile.am
===================================================================
--- GNUnet/src/applications/sqstore_mysql/Makefile.am   2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/sqstore_mysql/Makefile.am   2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -27,7 +27,7 @@
 libgnunetmodule_sqstore_mysql_la_SOURCES = \
   mysql.c 
 libgnunetmodule_sqstore_mysql_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module \
+  $(GN_PLUGIN_LDFLAGS) \
   $(MYSQL_LDFLAGS)
 libgnunetmodule_sqstore_mysql_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \

Modified: GNUnet/src/applications/sqstore_sqlite/Makefile.am
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/Makefile.am  2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/sqstore_sqlite/Makefile.am  2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -23,7 +23,7 @@
 libgnunetmodule_sqstore_sqlite_la_SOURCES = \
   sqlite.c 
 libgnunetmodule_sqstore_sqlite_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module \
+  $(GN_PLUGIN_LDFLAGS) \
   $(SQLITE_LDFLAGS)
 libgnunetmodule_sqstore_sqlite_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \

Modified: GNUnet/src/applications/state/Makefile.am
===================================================================
--- GNUnet/src/applications/state/Makefile.am   2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/state/Makefile.am   2008-11-17 15:48:09 UTC (rev 
7941)
@@ -13,7 +13,7 @@
 libgnunetmodule_state_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunetmodule_state_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 
 
 

Modified: GNUnet/src/applications/stats/Makefile.am
===================================================================
--- GNUnet/src/applications/stats/Makefile.am   2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/stats/Makefile.am   2008-11-17 15:48:09 UTC (rev 
7941)
@@ -27,6 +27,8 @@
 
 libgnunetstats_api_la_SOURCES = \
   clientapi.c 
+libgnunetstats_api_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetstats_api_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 
@@ -36,5 +38,5 @@
 libgnunetmodule_stats_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunetmodule_stats_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 

Modified: GNUnet/src/applications/tbench/Makefile.am
===================================================================
--- GNUnet/src/applications/tbench/Makefile.am  2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/tbench/Makefile.am  2008-11-17 15:48:09 UTC (rev 
7941)
@@ -27,7 +27,7 @@
 libgnunetmodule_tbench_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunetmodule_tbench_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 
 
 if HAVE_MHD

Modified: GNUnet/src/applications/template/Makefile.am
===================================================================
--- GNUnet/src/applications/template/Makefile.am        2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/template/Makefile.am        2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -22,7 +22,8 @@
 libgnunetmodule_template_la_SOURCES = \
   template.c 
 libgnunetmodule_template_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module \
+  $(GN_PLUGIN_LDFLAGS)
+libgnunetmodule_template_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 
 

Modified: GNUnet/src/applications/testing/Makefile.am
===================================================================
--- GNUnet/src/applications/testing/Makefile.am 2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/testing/Makefile.am 2008-11-17 15:48:09 UTC (rev 
7941)
@@ -11,12 +11,16 @@
 
 libgnunettesting_api_la_SOURCES = \
   testing.c 
+libgnunettesting_api_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunettesting_api_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/applications/identity/libgnunetidentity_api.la 
 
 libgnunetremote_api_la_SOURCES = \
   remote.c remote.h
+libgnunetremote_api_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunetremote_api_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/applications/identity/libgnunetidentity_api.la 

Modified: GNUnet/src/applications/topology_default/Makefile.am
===================================================================
--- GNUnet/src/applications/topology_default/Makefile.am        2008-11-17 
09:51:19 UTC (rev 7940)
+++ GNUnet/src/applications/topology_default/Makefile.am        2008-11-17 
15:48:09 UTC (rev 7941)
@@ -11,6 +11,6 @@
 libgnunetmodule_topology_default_la_SOURCES = \
   topology.c 
 libgnunetmodule_topology_default_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la 
 libgnunetmodule_topology_default_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)

Modified: GNUnet/src/applications/tracekit/Makefile.am
===================================================================
--- GNUnet/src/applications/tracekit/Makefile.am        2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/tracekit/Makefile.am        2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -29,15 +29,16 @@
 libgnunetmodule_tracekit_la_SOURCES = \
   tracekit.c \
   tracekit.h
-
+libgnunetmodule_tracekit_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
 libgnunetmodule_tracekit_la_LIBADD = \
   $(LDADD)
 
-libgnunetmodule_tracekit_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
 
 libgnunettracekit_api_la_SOURCES = \
   clientapi.c 
+libgnunettracekit_api_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunettracekit_api_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 

Modified: GNUnet/src/applications/traffic/Makefile.am
===================================================================
--- GNUnet/src/applications/traffic/Makefile.am 2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/traffic/Makefile.am 2008-11-17 15:48:09 UTC (rev 
7941)
@@ -11,6 +11,8 @@
 
 libgnunettraffic_api_la_SOURCES = \
   clientapi.c 
+libgnunettraffic_api_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
 libgnunettraffic_api_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 
@@ -20,4 +22,4 @@
 libgnunetmodule_traffic_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunetmodule_traffic_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)

Modified: GNUnet/src/applications/transport/Makefile.am
===================================================================
--- GNUnet/src/applications/transport/Makefile.am       2008-11-17 09:51:19 UTC 
(rev 7940)
+++ GNUnet/src/applications/transport/Makefile.am       2008-11-17 15:48:09 UTC 
(rev 7941)
@@ -12,7 +12,7 @@
 libgnunetmodule_transport_la_SOURCES = \
   transport.c 
 libgnunetmodule_transport_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la 
 libgnunetmodule_transport_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 

Modified: GNUnet/src/applications/vpn/Makefile.am
===================================================================
--- GNUnet/src/applications/vpn/Makefile.am     2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/applications/vpn/Makefile.am     2008-11-17 15:48:09 UTC (rev 
7941)
@@ -25,6 +25,6 @@
   p2p.c p2p.h \
   vpn.c vpn.h
 libgnunetmodule_vpn_la_LDFLAGS = \
-  -export-dynamic -avoid-version -module
+  $(GN_PLUGIN_LDFLAGS)
 libgnunetmodule_vpn_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la 

Modified: GNUnet/src/libs/mysql/Makefile.am
===================================================================
--- GNUnet/src/libs/mysql/Makefile.am   2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/libs/mysql/Makefile.am   2008-11-17 15:48:09 UTC (rev 7941)
@@ -17,7 +17,7 @@
 libgnunetmysql_la_SOURCES = \
   lmysql.c 
 libgnunetmysql_la_LDFLAGS = \
-  $(MYSQL_LDFLAGS)
+  $(GN_LIB_LDFLAGS) $(MYSQL_LDFLAGS)
 libgnunetmysql_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   -lmysqlclient $(ZLIB_LNK)

Modified: GNUnet/src/server/Makefile.am
===================================================================
--- GNUnet/src/server/Makefile.am       2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/server/Makefile.am       2008-11-17 15:48:09 UTC (rev 7941)
@@ -23,8 +23,9 @@
  version.c version.h
 libgnunetcore_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la 
+libgnunetcore_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS)
 
-
 gnunetd_SOURCES = \
  gnunetd.c 
 gnunetd_LDADD = \

Modified: GNUnet/src/setup/cocoa/Makefile.am
===================================================================
--- GNUnet/src/setup/cocoa/Makefile.am  2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/setup/cocoa/Makefile.am  2008-11-17 15:48:09 UTC (rev 7941)
@@ -23,10 +23,11 @@
  PackingBoxContainer.m PackingBoxContainer.h
 
 libgnunetsetup_cocoa_la_LDFLAGS = \
- -framework Cocoa -lm \
- -export-dynamic -avoid-version -module
+ $(GN_PLUGIN_LDFLAGS) \
+ -framework Cocoa
 
 libgnunetsetup_cocoa_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/setup/lib/libgnunetsetup.la
+ $(top_builddir)/src/setup/lib/libgnunetsetup.la \
+ -lm
 

Modified: GNUnet/src/setup/gtk/Makefile.am
===================================================================
--- GNUnet/src/setup/gtk/Makefile.am    2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/setup/gtk/Makefile.am    2008-11-17 15:48:09 UTC (rev 7941)
@@ -30,8 +30,7 @@
  wizard_gtk.c wizard_gtk.h
 
 libgnunetsetup_gtk_la_LDFLAGS = \
- $(GTK_LIBS) @EXT_LIB_PATH@ @EXT_LIBS@ \
- -export-dynamic -avoid-version -module
+ $(GN_PLUGIN_LDFLAGS)
 
 libgnunetsetup_gtk_la_CFLAGS = \
  -I$(top_scrdir)/include \

Modified: GNUnet/src/setup/lib/Makefile.am
===================================================================
--- GNUnet/src/setup/lib/Makefile.am    2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/setup/lib/Makefile.am    2008-11-17 15:48:09 UTC (rev 7941)
@@ -21,10 +21,11 @@
   wizard_util.c wizard_util.h
 
 libgnunetsetup_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GUILE_LIB)
 
 libgnunetsetup_la_LDFLAGS = \
- -export-dynamic $(GUILE_LIB)
+ $(GN_LIB_LDFLAGS)
 
 libgnunetsetup_la_CFLAGS = -I$(top_scrdir)/include 
 

Modified: GNUnet/src/setup/ncurses/Makefile.am
===================================================================
--- GNUnet/src/setup/ncurses/Makefile.am        2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/setup/ncurses/Makefile.am        2008-11-17 15:48:09 UTC (rev 
7941)
@@ -28,10 +28,10 @@
 endif
 
 libgnunetsetup_curses_la_LDFLAGS = \
- -lncursesw $(DIALOG_LIBS) -lm \
- -export-dynamic -avoid-version -module
+ $(GN_PLUGIN_LDFLAGS)
 
 libgnunetsetup_curses_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/setup/lib/libgnunetsetup.la
+ $(top_builddir)/src/setup/lib/libgnunetsetup.la \
+ -lncursesw $(DIALOG_LIBS) -lm
 

Modified: GNUnet/src/setup/qt/Makefile.am
===================================================================
--- GNUnet/src/setup/qt/Makefile.am     2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/setup/qt/Makefile.am     2008-11-17 15:48:09 UTC (rev 7941)
@@ -17,8 +17,7 @@
   ui_gnunet-setup.h
 
 libgnunetsetup_qt_la_LDFLAGS = \
- $(QTLIBS) @EXT_LIB_PATH@ @EXT_LIBS@ \
- -export-dynamic -avoid-version -module
+ $(GN_PLUGIN_LDFLAGS)
 
 libgnunetsetup_qt_la_CXXFLAGS = \
  -I$(top_scrdir)/include \

Modified: GNUnet/src/setup/text/Makefile.am
===================================================================
--- GNUnet/src/setup/text/Makefile.am   2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/setup/text/Makefile.am   2008-11-17 15:48:09 UTC (rev 7941)
@@ -12,7 +12,7 @@
   conf.c conf.h
 
 libgnunetsetup_text_la_LDFLAGS = \
- -export-dynamic -avoid-version -module
+ $(GN_PLUGIN_LDFLAGS)
 
 libgnunetsetup_text_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \

Modified: GNUnet/src/transports/Makefile.am
===================================================================
--- GNUnet/src/transports/Makefile.am   2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/transports/Makefile.am   2008-11-17 15:48:09 UTC (rev 7941)
@@ -51,7 +51,7 @@
 libgnunettransport_smtp_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la -lesmtp
 libgnunettransport_smtp_la_LDFLAGS = \
- -export-dynamic -avoid-version -module 
+ $(GN_PLUGIN_LDFLAGS)
 
 libgnunettransport_http_la_SOURCES = http.c
 libgnunettransport_http_la_LIBADD = \
@@ -59,7 +59,7 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunetip.la
 libgnunettransport_http_la_LDFLAGS = \
- -export-dynamic -avoid-version -module 
+ $(GN_PLUGIN_LDFLAGS) 
 libgnunettransport_http_la_CPPFLAGS = \
  @LIBCURL_CPPFLAGS@
 
@@ -68,21 +68,21 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunetip.la
 libgnunettransport_tcp_la_LDFLAGS = \
- -export-dynamic -avoid-version -module 
+ $(GN_PLUGIN_LDFLAGS)
 
 libgnunettransport_nat_la_SOURCES = nat.c
 libgnunettransport_nat_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunetip.la 
 libgnunettransport_nat_la_LDFLAGS = \
- -export-dynamic -avoid-version -module 
+ $(GN_PLUGIN_LDFLAGS)
 
 libgnunettransport_udp_la_SOURCES = udp.c
 libgnunettransport_udp_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunetip.la
 libgnunettransport_udp_la_LDFLAGS = \
- -export-dynamic -avoid-version -module 
+ $(GN_PLUGIN_LDFLAGS)
 
 
 

Modified: GNUnet/src/transports/upnp/Makefile.am
===================================================================
--- GNUnet/src/transports/upnp/Makefile.am      2008-11-17 09:51:19 UTC (rev 
7940)
+++ GNUnet/src/transports/upnp/Makefile.am      2008-11-17 15:48:09 UTC (rev 
7941)
@@ -23,7 +23,7 @@
  xmlnode.c xmlnode.h 
 
 libgnunetmodule_upnp_la_LDFLAGS = \
- -export-dynamic -avoid-version -module
+ $(GN_PLUGIN_LDFLAGS)
 libgnunetmodule_upnp_la_CFLAGS = \
  -I$(top_scrdir)/include \
  @LIBCURL_CPPFLAGS@ @XML_CPPFLAGS@

Modified: GNUnet/src/util/Makefile.am
===================================================================
--- GNUnet/src/util/Makefile.am 2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/util/Makefile.am 2008-11-17 15:48:09 UTC (rev 7941)
@@ -27,7 +27,7 @@
 LIBS = @LIBINTL@ @LIBICONV@ @LIBS@
 
 if SOLARIS
- SOLFLAGS = -lrt
+ SOLLIBADD = -lrt
 endif
 
 if MINGW
@@ -35,15 +35,15 @@
  WINSUBDIRS = win
  WINLIBADD = $(top_builddir)/src/util/win/libwin.la 
 else
- DLFLAG = -ldl
+ DLLIBADD = -ldl
 endif
 
 if XFREEBSD
- DLFLAG=
+ DLLIBADD=
 endif
 
 if OPENBSD
- DLFLAG=
+ DLLIBADD=
 endif
 
 
@@ -59,7 +59,7 @@
 
 lib_LTLIBRARIES = libgnunetutil.la
 
-libgnunetutil_la_LIBADD = $(GCLIBADD) $(CYGLIBADD) $(WINLIBADD) \
+libgnunetutil_la_LIBADD = \
  boot/libboot.la \
  config/libconfig.la \
  containers/libcontainers.la \
@@ -74,7 +74,13 @@
  network_client/libnetwork_client.la \
  os/libos.la \
  pseudonym/libpseudonym.la \
- threads/libthreads.la
+ threads/libthreads.la \
+ $(GCLIBADD) $(CYGLIBADD) $(WINLIBADD) \
+ $(LIBGCRYPT_LIBS) \
+ -lgmp \
+ $(LIBLTDL) \
+ $(SOLLIBADD) \
+ $(DLLIBADD)
 
 libgnunetutil_la_SOURCES = libgnunetutil.c
 
@@ -82,6 +88,6 @@
   check.conf
 
 libgnunetutil_la_LDFLAGS = \
- -export-dynamic $(LIBLTDL) $(LIBGCRYPT_LIBS) $(SOLFLAGS) $(WINFLAGS) $(LIBS) 
-lgmp $(DLFLAG) \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
  -version-info 3:0:0
 

Modified: GNUnet/src/util/crypto/Makefile.am
===================================================================
--- GNUnet/src/util/crypto/Makefile.am  2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/util/crypto/Makefile.am  2008-11-17 15:48:09 UTC (rev 7941)
@@ -11,10 +11,10 @@
 AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS) -O3
 
 libcrypto_la_LIBADD = \
- $(GCLIBADD) 
+ $(GCLIBADD) \
+ $(LIBGCRYPT_LIBS) \
+ -lgmp
 
-libcrypto_la_LDFLAGS = $(LIBGCRYPT_LIBS) -lgmp
-
 libcrypto_la_SOURCES = \
  crc32.c \
  hashing.c \

Modified: GNUnet/src/util/network/Makefile.am
===================================================================
--- GNUnet/src/util/network/Makefile.am 2008-11-17 09:51:19 UTC (rev 7940)
+++ GNUnet/src/util/network/Makefile.am 2008-11-17 15:48:09 UTC (rev 7941)
@@ -9,10 +9,10 @@
 endif
 
 if HAVE_C_ARES
-AR_LINK=-lcares
+ AR_LINK=-lcares
 else
 if HAVE_ADNS
-AR_LINK=-ladns
+ AR_LINK=-ladns
 endif
 endif
 
@@ -23,7 +23,8 @@
  ip.c \
  ipcheck.c \
  select.c 
-libnetwork_la_LIBADD = $(AR_LINK)
+libnetwork_la_LIBADD = \
+ $(AR_LINK)
 
 check_PROGRAMS = \
  ipchecktest \