diff options
author | LRN <lrn1986@gmail.com> | 2014-08-01 12:20:36 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2014-08-01 12:20:36 +0000 |
commit | 5af3601273f0ed5e4d0f4e3e7039525a7b7ff4b3 (patch) | |
tree | 07ed47290000ab23c4752be71e0a5e6f8256d737 /src/conversation | |
parent | 1fed0331759cf7f2c7a60b7a8c3a478f1ebc251d (diff) | |
download | gnunet-5af3601273f0ed5e4d0f4e3e7039525a7b7ff4b3.tar.gz gnunet-5af3601273f0ed5e4d0f4e3e7039525a7b7ff4b3.zip |
There's no GNUNET_LDFLAGS, there's only GN_LIB_FLAGS
This fixes a number of build errors on W32, where -no-undefined is needed
to link shared libraries, and -no-undefined comes via GN_LIB_FLAGS.
Diffstat (limited to 'src/conversation')
-rw-r--r-- | src/conversation/Makefile.am | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index d5219cae9..a8c1e8788 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am | |||
@@ -38,7 +38,7 @@ libgnunetmicrophone_la_SOURCES = \ | |||
38 | libgnunetmicrophone_la_LIBADD = \ | 38 | libgnunetmicrophone_la_LIBADD = \ |
39 | $(top_builddir)/src/util/libgnunetutil.la | 39 | $(top_builddir)/src/util/libgnunetutil.la |
40 | libgnunetmicrophone_la_LDFLAGS = \ | 40 | libgnunetmicrophone_la_LDFLAGS = \ |
41 | $(GNUNET_LDFLAGS) $(WINFLAGS) \ | 41 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
42 | -version-info 0:0:0 | 42 | -version-info 0:0:0 |
43 | 43 | ||
44 | libgnunetspeaker_la_SOURCES = \ | 44 | libgnunetspeaker_la_SOURCES = \ |
@@ -46,7 +46,7 @@ libgnunetspeaker_la_SOURCES = \ | |||
46 | libgnunetspeaker_la_LIBADD = \ | 46 | libgnunetspeaker_la_LIBADD = \ |
47 | $(top_builddir)/src/util/libgnunetutil.la | 47 | $(top_builddir)/src/util/libgnunetutil.la |
48 | libgnunetspeaker_la_LDFLAGS = \ | 48 | libgnunetspeaker_la_LDFLAGS = \ |
49 | $(GNUNET_LDFLAGS) $(WINFLAGS) \ | 49 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
50 | -version-info 0:0:0 | 50 | -version-info 0:0:0 |
51 | 51 | ||
52 | 52 | ||
@@ -62,7 +62,7 @@ libgnunetconversation_la_LIBADD = \ | |||
62 | $(top_builddir)/src/util/libgnunetutil.la | 62 | $(top_builddir)/src/util/libgnunetutil.la |
63 | 63 | ||
64 | libgnunetconversation_la_LDFLAGS = \ | 64 | libgnunetconversation_la_LDFLAGS = \ |
65 | $(GNUNET_LDFLAGS) $(WINFLAGS) \ | 65 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
66 | -version-info 0:0:0 | 66 | -version-info 0:0:0 |
67 | 67 | ||
68 | 68 | ||
@@ -105,7 +105,7 @@ gnunet_helper_audio_record_LDADD = \ | |||
105 | -lpulse -lopus -logg \ | 105 | -lpulse -lopus -logg \ |
106 | $(INTLLIBS) | 106 | $(INTLLIBS) |
107 | gnunet_helper_audio_record_LDFLAGS = \ | 107 | gnunet_helper_audio_record_LDFLAGS = \ |
108 | $(GNUNET_LDFLAGS) $(WINFLAGS) | 108 | $(WINFLAGS) |
109 | 109 | ||
110 | gnunet_helper_audio_playback_SOURCES = \ | 110 | gnunet_helper_audio_playback_SOURCES = \ |
111 | gnunet-helper-audio-playback.c | 111 | gnunet-helper-audio-playback.c |
@@ -114,7 +114,7 @@ gnunet_helper_audio_playback_LDADD = \ | |||
114 | -lpulse -lopus -logg \ | 114 | -lpulse -lopus -logg \ |
115 | $(INTLLIBS) | 115 | $(INTLLIBS) |
116 | gnunet_helper_audio_playback_LDFLAGS = \ | 116 | gnunet_helper_audio_playback_LDFLAGS = \ |
117 | $(GNUNET_LDFLAGS) $(WINFLAGS) | 117 | $(WINFLAGS) |
118 | else | 118 | else |
119 | if BUILD_GST_HELPERS | 119 | if BUILD_GST_HELPERS |
120 | gnunet_helper_audio_record_SOURCES = \ | 120 | gnunet_helper_audio_record_SOURCES = \ |
@@ -124,7 +124,7 @@ gnunet_helper_audio_record_LDADD = \ | |||
124 | $(GST_LIBS) \ | 124 | $(GST_LIBS) \ |
125 | $(INTLLIBS) | 125 | $(INTLLIBS) |
126 | gnunet_helper_audio_record_LDFLAGS = \ | 126 | gnunet_helper_audio_record_LDFLAGS = \ |
127 | $(GNUNET_LDFLAGS) $(WINFLAGS) $(GST_LDFLAGS) | 127 | $(WINFLAGS) $(GST_LDFLAGS) |
128 | gnunet_helper_audio_record_CFLAGS = \ | 128 | gnunet_helper_audio_record_CFLAGS = \ |
129 | $(GST_CFLAGS) | 129 | $(GST_CFLAGS) |
130 | 130 | ||
@@ -135,7 +135,7 @@ gnunet_helper_audio_playback_LDADD = \ | |||
135 | $(GST_LIBS) \ | 135 | $(GST_LIBS) \ |
136 | $(INTLLIBS) | 136 | $(INTLLIBS) |
137 | gnunet_helper_audio_playback_LDFLAGS = \ | 137 | gnunet_helper_audio_playback_LDFLAGS = \ |
138 | $(GNUNET_LDFLAGS) $(WINFLAGS) $(GST_LDFLAGS) | 138 | $(WINFLAGS) $(GST_LDFLAGS) |
139 | gnunet_helper_audio_playback_CFLAGS = \ | 139 | gnunet_helper_audio_playback_CFLAGS = \ |
140 | $(GST_CFLAGS) | 140 | $(GST_CFLAGS) |
141 | endif | 141 | endif |
@@ -151,7 +151,7 @@ gnunet_service_conversation_LDADD = \ | |||
151 | $(top_builddir)/src/util/libgnunetutil.la \ | 151 | $(top_builddir)/src/util/libgnunetutil.la \ |
152 | $(INTLLIBS) | 152 | $(INTLLIBS) |
153 | gnunet_service_conversation_LDFLAGS = \ | 153 | gnunet_service_conversation_LDFLAGS = \ |
154 | $(GNUNET_LDFLAGS) $(WINFLAGS) | 154 | $(WINFLAGS) |
155 | 155 | ||
156 | gnunet_conversation_SOURCES = \ | 156 | gnunet_conversation_SOURCES = \ |
157 | gnunet-conversation.c | 157 | gnunet-conversation.c |
@@ -166,7 +166,7 @@ gnunet_conversation_LDADD = \ | |||
166 | $(top_builddir)/src/util/libgnunetutil.la \ | 166 | $(top_builddir)/src/util/libgnunetutil.la \ |
167 | $(INTLLIBS) | 167 | $(INTLLIBS) |
168 | gnunet_conversation_LDFLAGS = \ | 168 | gnunet_conversation_LDFLAGS = \ |
169 | $(GNUNET_LDFLAGS) $(WINFLAGS) | 169 | $(WINFLAGS) |
170 | 170 | ||
171 | gnunet_conversation_test_SOURCES = \ | 171 | gnunet_conversation_test_SOURCES = \ |
172 | gnunet-conversation-test.c | 172 | gnunet-conversation-test.c |
@@ -176,7 +176,7 @@ gnunet_conversation_test_LDADD = \ | |||
176 | $(top_builddir)/src/util/libgnunetutil.la \ | 176 | $(top_builddir)/src/util/libgnunetutil.la \ |
177 | $(INTLLIBS) | 177 | $(INTLLIBS) |
178 | gnunet_conversation_test_LDFLAGS = \ | 178 | gnunet_conversation_test_LDFLAGS = \ |
179 | $(GNUNET_LDFLAGS) $(WINFLAGS) | 179 | $(WINFLAGS) |
180 | 180 | ||
181 | 181 | ||
182 | test_conversation_api_SOURCES = \ | 182 | test_conversation_api_SOURCES = \ |
@@ -191,7 +191,7 @@ test_conversation_api_LDADD = \ | |||
191 | $(top_builddir)/src/testing/libgnunettesting.la \ | 191 | $(top_builddir)/src/testing/libgnunettesting.la \ |
192 | $(top_builddir)/src/util/libgnunetutil.la | 192 | $(top_builddir)/src/util/libgnunetutil.la |
193 | test_conversation_api_LDFLAGS = \ | 193 | test_conversation_api_LDFLAGS = \ |
194 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic | 194 | $(WINFLAGS) -export-dynamic |
195 | 195 | ||
196 | test_conversation_api_twocalls_SOURCES = \ | 196 | test_conversation_api_twocalls_SOURCES = \ |
197 | test_conversation_api_twocalls.c | 197 | test_conversation_api_twocalls.c |
@@ -205,7 +205,7 @@ test_conversation_api_twocalls_LDADD = \ | |||
205 | $(top_builddir)/src/testing/libgnunettesting.la \ | 205 | $(top_builddir)/src/testing/libgnunettesting.la \ |
206 | $(top_builddir)/src/util/libgnunetutil.la | 206 | $(top_builddir)/src/util/libgnunetutil.la |
207 | test_conversation_api_twocalls_LDFLAGS = \ | 207 | test_conversation_api_twocalls_LDFLAGS = \ |
208 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic | 208 | $(WINFLAGS) -export-dynamic |
209 | 209 | ||
210 | test_conversation_api_reject_SOURCES = \ | 210 | test_conversation_api_reject_SOURCES = \ |
211 | test_conversation_api_reject.c | 211 | test_conversation_api_reject.c |
@@ -219,7 +219,7 @@ test_conversation_api_reject_LDADD = \ | |||
219 | $(top_builddir)/src/testing/libgnunettesting.la \ | 219 | $(top_builddir)/src/testing/libgnunettesting.la \ |
220 | $(top_builddir)/src/util/libgnunetutil.la | 220 | $(top_builddir)/src/util/libgnunetutil.la |
221 | test_conversation_api_reject_LDFLAGS = \ | 221 | test_conversation_api_reject_LDFLAGS = \ |
222 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic | 222 | $(WINFLAGS) -export-dynamic |
223 | 223 | ||
224 | 224 | ||
225 | pkgcfg_DATA = conversation.conf | 225 | pkgcfg_DATA = conversation.conf |