aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-11-05 09:06:32 +0000
committerChristian Grothoff <christian@grothoff.org>2011-11-05 09:06:32 +0000
commitb8fb774718de49d5a96e6cfa5b38a42b9f3f0e6a (patch)
tree3f1cdfbb5aecf88ab5fe27af29b81202241934b2
parent0bae85f2b4fe6e55a3f5164066afe64cf499432b (diff)
downloadgnunet-b8fb774718de49d5a96e6cfa5b38a42b9f3f0e6a.tar.gz
gnunet-b8fb774718de49d5a96e6cfa5b38a42b9f3f0e6a.zip
LRN: Add '-Wl,' prefix to -no-undefined
-no-undefined is not a valid compiler option as of GCC 4.6.x (it IS valid linker option). Note that this REQUIRES an extra -no-undefined to be passed to libtool (this is done by GN_LIB_LDLFAGS and GN_PLUGIN_LDFLAGS), because libtool does not understand -Wl,-no-undefined.
-rw-r--r--configure.ac2
-rw-r--r--src/ats/Makefile.am3
-rw-r--r--src/block/Makefile.am2
-rw-r--r--src/fragmentation/Makefile.am2
-rw-r--r--src/hello/Makefile.am2
-rw-r--r--src/testing/Makefile.am2
-rw-r--r--src/transport/Makefile.am2
-rw-r--r--src/util/Makefile.am2
8 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 148c827bc..7957cc2a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,7 @@ netbsd*)
141 AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) 141 AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
142 AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system]) 142 AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system])
143 AC_CHECK_LIB(intl, gettext) 143 AC_CHECK_LIB(intl, gettext)
144 LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols" 144 LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols"
145 LIBS="$LIBS -lws2_32 -lplibc" 145 LIBS="$LIBS -lws2_32 -lplibc"
146 CFLAGS="-mms-bitfields $CFLAGS" 146 CFLAGS="-mms-bitfields $CFLAGS"
147 CPPFLAGS="-D_WIN32_WINNT=0x0501 $CPPFLAGS" 147 CPPFLAGS="-D_WIN32_WINNT=0x0501 $CPPFLAGS"
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 35cd75f59..adccc7e35 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -22,6 +22,9 @@ libgnunetats_la_SOURCES = \
22libgnunetats_la_LIBADD = \ 22libgnunetats_la_LIBADD = \
23 $(top_builddir)/src/util/libgnunetutil.la 23 $(top_builddir)/src/util/libgnunetutil.la
24 24
25libgnunetats_la_LDFLAGS = \
26 $(GN_LIB_LDFLAGS)
27
25 28
26bin_PROGRAMS = \ 29bin_PROGRAMS = \
27 gnunet-service-ats 30 gnunet-service-ats
diff --git a/src/block/Makefile.am b/src/block/Makefile.am
index 5549104e0..cfbcb797f 100644
--- a/src/block/Makefile.am
+++ b/src/block/Makefile.am
@@ -73,6 +73,8 @@ libgnunetblock_la_LIBADD = \
73 $(top_builddir)/src/util/libgnunetutil.la 73 $(top_builddir)/src/util/libgnunetutil.la
74libgnunetblock_la_DEPENDENCIES = \ 74libgnunetblock_la_DEPENDENCIES = \
75 $(top_builddir)/src/util/libgnunetutil.la 75 $(top_builddir)/src/util/libgnunetutil.la
76libgnunetblock_la_LDFLAGS = \
77 $(GN_LIB_LDFLAGS)
76 78
77check_PROGRAMS = \ 79check_PROGRAMS = \
78 test_block 80 test_block
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am
index 0d6164a48..488ad2e51 100644
--- a/src/fragmentation/Makefile.am
+++ b/src/fragmentation/Makefile.am
@@ -16,6 +16,8 @@ libgnunetfragmentation_la_SOURCES = \
16libgnunetfragmentation_la_LIBADD = -lm \ 16libgnunetfragmentation_la_LIBADD = -lm \
17 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 17 $(top_builddir)/src/statistics/libgnunetstatistics.la \
18 $(top_builddir)/src/util/libgnunetutil.la 18 $(top_builddir)/src/util/libgnunetutil.la
19libgnunetfragmentation_la_LDFLAGS = \
20 $(GN_LIB_LDFLAGS)
19 21
20check_PROGRAMS = \ 22check_PROGRAMS = \
21 test_fragmentation 23 test_fragmentation
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am
index c2bc5cd69..61c84e50e 100644
--- a/src/hello/Makefile.am
+++ b/src/hello/Makefile.am
@@ -15,6 +15,8 @@ libgnunethello_la_SOURCES = \
15 hello.c 15 hello.c
16libgnunethello_la_LIBADD = \ 16libgnunethello_la_LIBADD = \
17 $(top_builddir)/src/util/libgnunetutil.la $(XLIB) 17 $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
18libgnunethello_la_LDFLAGS = \
19 $(GN_LIB_LDFLAGS)
18 20
19check_PROGRAMS = \ 21check_PROGRAMS = \
20 test_hello 22 test_hello
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 008692fbd..bc81d8d3a 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -46,6 +46,8 @@ libgnunettesting_la_LIBADD = $(XLIB) \
46 $(top_builddir)/src/hello/libgnunethello.la \ 46 $(top_builddir)/src/hello/libgnunethello.la \
47 -lm \ 47 -lm \
48 $(top_builddir)/src/util/libgnunetutil.la 48 $(top_builddir)/src/util/libgnunetutil.la
49libgnunettesting_la_LDFLAGS = \
50 $(GN_LIB_LDFLAGS)
49 51
50check_PROGRAMS = \ 52check_PROGRAMS = \
51 test_testing \ 53 test_testing \
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index e5230410c..7beaf584d 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -77,6 +77,8 @@ libgnunettransporttesting_la_LIBADD = \
77 $(GN_LIBINTL) 77 $(GN_LIBINTL)
78libgnunettransporttesting_la_DEPENDENCIES = \ 78libgnunettransporttesting_la_DEPENDENCIES = \
79 libgnunettransport.la 79 libgnunettransport.la
80libgnunettransporttesting_la_LDFLAGS = \
81 $(GN_LIB_LDFLAGS)
80 82
81libgnunettransport_la_SOURCES = \ 83libgnunettransport_la_SOURCES = \
82 transport_api.c transport.h \ 84 transport_api.c transport.h \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 98af8383a..c62fc4246 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -14,7 +14,7 @@ libgnunetutilwin_la_SOURCES = \
14 win.cc \ 14 win.cc \
15 winproc.c 15 winproc.c
16libgnunetutilwin_la_LDFLAGS = \ 16libgnunetutilwin_la_LDFLAGS = \
17 -Wl,--no-undefined -Wl,--export-all-symbols 17 -no-undefined -Wl,--export-all-symbols
18libgnunetutilwin_la_LIBADD = \ 18libgnunetutilwin_la_LIBADD = \
19 -lshell32 -liconv -lstdc++ \ 19 -lshell32 -liconv -lstdc++ \
20 -lcomdlg32 -lgdi32 20 -lcomdlg32 -lgdi32