[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34097 - in gnunet/src: conversation peerstore sensor
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34097 - in gnunet/src: conversation peerstore sensor |
Date: |
Fri, 1 Aug 2014 14:20:36 +0200 |
Author: LRN
Date: 2014-08-01 14:20:36 +0200 (Fri, 01 Aug 2014)
New Revision: 34097
Modified:
gnunet/src/conversation/Makefile.am
gnunet/src/peerstore/Makefile.am
gnunet/src/sensor/Makefile.am
Log:
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.
Modified: gnunet/src/conversation/Makefile.am
===================================================================
--- gnunet/src/conversation/Makefile.am 2014-08-01 12:20:32 UTC (rev 34096)
+++ gnunet/src/conversation/Makefile.am 2014-08-01 12:20:36 UTC (rev 34097)
@@ -38,7 +38,7 @@
libgnunetmicrophone_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la
libgnunetmicrophone_la_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:0:0
libgnunetspeaker_la_SOURCES = \
@@ -46,7 +46,7 @@
libgnunetspeaker_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la
libgnunetspeaker_la_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:0:0
@@ -62,7 +62,7 @@
$(top_builddir)/src/util/libgnunetutil.la
libgnunetconversation_la_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) \
+ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:0:0
@@ -105,7 +105,7 @@
-lpulse -lopus -logg \
$(INTLLIBS)
gnunet_helper_audio_record_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS)
+ $(WINFLAGS)
gnunet_helper_audio_playback_SOURCES = \
gnunet-helper-audio-playback.c
@@ -114,7 +114,7 @@
-lpulse -lopus -logg \
$(INTLLIBS)
gnunet_helper_audio_playback_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS)
+ $(WINFLAGS)
else
if BUILD_GST_HELPERS
gnunet_helper_audio_record_SOURCES = \
@@ -124,7 +124,7 @@
$(GST_LIBS) \
$(INTLLIBS)
gnunet_helper_audio_record_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) $(GST_LDFLAGS)
+ $(WINFLAGS) $(GST_LDFLAGS)
gnunet_helper_audio_record_CFLAGS = \
$(GST_CFLAGS)
@@ -135,7 +135,7 @@
$(GST_LIBS) \
$(INTLLIBS)
gnunet_helper_audio_playback_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) $(GST_LDFLAGS)
+ $(WINFLAGS) $(GST_LDFLAGS)
gnunet_helper_audio_playback_CFLAGS = \
$(GST_CFLAGS)
endif
@@ -151,7 +151,7 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(INTLLIBS)
gnunet_service_conversation_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS)
+ $(WINFLAGS)
gnunet_conversation_SOURCES = \
gnunet-conversation.c
@@ -166,7 +166,7 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(INTLLIBS)
gnunet_conversation_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS)
+ $(WINFLAGS)
gnunet_conversation_test_SOURCES = \
gnunet-conversation-test.c
@@ -176,7 +176,7 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(INTLLIBS)
gnunet_conversation_test_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS)
+ $(WINFLAGS)
test_conversation_api_SOURCES = \
@@ -191,7 +191,7 @@
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
test_conversation_api_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
+ $(WINFLAGS) -export-dynamic
test_conversation_api_twocalls_SOURCES = \
test_conversation_api_twocalls.c
@@ -205,7 +205,7 @@
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
test_conversation_api_twocalls_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
+ $(WINFLAGS) -export-dynamic
test_conversation_api_reject_SOURCES = \
test_conversation_api_reject.c
@@ -219,7 +219,7 @@
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
test_conversation_api_reject_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
+ $(WINFLAGS) -export-dynamic
pkgcfg_DATA = conversation.conf
Modified: gnunet/src/peerstore/Makefile.am
===================================================================
--- gnunet/src/peerstore/Makefile.am 2014-08-01 12:20:32 UTC (rev 34096)
+++ gnunet/src/peerstore/Makefile.am 2014-08-01 12:20:36 UTC (rev 34097)
@@ -47,7 +47,7 @@
libgnunetpeerstore_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la
libgnunetpeerstore_la_LDFLAGS = \
- $(GNUNET_LDFLAGS)
+ $(GN_LIB_LDFLAGS)
plugin_LTLIBRARIES = \
libgnunet_plugin_peerstore_sqlite.la
Modified: gnunet/src/sensor/Makefile.am
===================================================================
--- gnunet/src/sensor/Makefile.am 2014-08-01 12:20:32 UTC (rev 34096)
+++ gnunet/src/sensor/Makefile.am 2014-08-01 12:20:36 UTC (rev 34097)
@@ -52,7 +52,7 @@
libgnunetsensor_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la
libgnunetsensor_la_LDFLAGS = \
- $(GNUNET_LDFLAGS)
+ $(GN_LIB_LDFLAGS)
libgnunetsensorutil_la_SOURCES = \
sensor_util_lib.c
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34097 - in gnunet/src: conversation peerstore sensor,
gnunet <=