From 4d21b22fd4353535d8023a3ac63370e6cc4c0407 Mon Sep 17 00:00:00 2001 From: ng0 Date: Fri, 25 Oct 2019 09:25:46 +0000 Subject: follow-up to win32 removal. --- src/arm/Makefile.am | 2 +- src/ats/Makefile.am | 2 +- src/cadet/Makefile.am | 2 +- src/conversation/Makefile.am | 30 +++++++++++++++--------------- src/core/Makefile.am | 2 +- src/datacache/Makefile.am | 2 +- src/datastore/Makefile.am | 2 +- src/dht/Makefile.am | 2 +- src/fs/Makefile.am | 2 +- src/gnsrecord/Makefile.am | 2 +- src/identity/Makefile.am | 2 +- src/namecache/Makefile.am | 2 +- src/namestore/Makefile.am | 2 +- src/nat-auto/Makefile.am | 2 +- src/nat/Makefile.am | 2 +- src/nse/Makefile.am | 2 +- src/peerinfo/Makefile.am | 2 +- src/reclaim-attribute/Makefile.am | 2 +- src/reclaim/Makefile.am | 2 +- src/regex/Makefile.am | 2 +- src/revocation/Makefile.am | 2 +- src/rps/Makefile.am | 2 +- src/statistics/Makefile.am | 2 +- src/topology/Makefile.am | 2 +- src/transport/Makefile.am | 10 +++++----- 25 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am index 28440d857..422084bfe 100644 --- a/src/arm/Makefile.am +++ b/src/arm/Makefile.am @@ -21,7 +21,7 @@ libgnunetarm_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetarm_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 2:0:0 diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index bd8962158..0b8e7309a 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am @@ -30,7 +30,7 @@ libgnunetats_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) libgnunetats_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 4:0:0 libgnunet_plugin_ats_proportional_la_SOURCES = \ diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am index cd4beb4b7..b6e72688d 100644 --- a/src/cadet/Makefile.am +++ b/src/cadet/Makefile.am @@ -40,7 +40,7 @@ libgnunetcadet_la_LIBADD = \ $(XLIB) \ $(LTLIBINTL) libgnunetcadet_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 7:0:0 gnunet_cadet_SOURCES = \ diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index dc8283e9b..2be4ba796 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am @@ -52,7 +52,7 @@ libgnunetmicrophone_la_SOURCES = \ libgnunetmicrophone_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetmicrophone_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 libgnunetspeaker_la_SOURCES = \ @@ -60,7 +60,7 @@ libgnunetspeaker_la_SOURCES = \ libgnunetspeaker_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetspeaker_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 @@ -76,7 +76,7 @@ libgnunetconversation_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la libgnunetconversation_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 @@ -117,7 +117,7 @@ gnunet_helper_audio_record_LDADD = \ -lpulse -lopus -logg \ $(INTLLIBS) gnunet_helper_audio_record_LDFLAGS = \ - $(WINFLAGS) + gnunet_helper_audio_playback_SOURCES = \ gnunet-helper-audio-playback.c @@ -126,7 +126,7 @@ gnunet_helper_audio_playback_LDADD = \ -lpulse -lopus -logg \ $(INTLLIBS) gnunet_helper_audio_playback_LDFLAGS = \ - $(WINFLAGS) + else if BUILD_GST_HELPERS gnunet_helper_audio_record_SOURCES = \ @@ -136,7 +136,7 @@ gnunet_helper_audio_record_LDADD = \ $(GST_LIBS) \ $(INTLLIBS) gnunet_helper_audio_record_LDFLAGS = \ - $(WINFLAGS) $(GST_LDFLAGS) + $(GST_LDFLAGS) gnunet_helper_audio_record_CFLAGS = \ $(GST_CFLAGS) @@ -147,7 +147,7 @@ gnunet_helper_audio_playback_LDADD = \ $(GST_LIBS) \ $(INTLLIBS) gnunet_helper_audio_playback_LDFLAGS = \ - $(WINFLAGS) $(GST_LDFLAGS) + $(GST_LDFLAGS) gnunet_helper_audio_playback_CFLAGS = \ $(GST_CFLAGS) -DIS_SPEAKER else @@ -159,7 +159,7 @@ gnunet_helper_audio_record_LDADD = \ $(GST_LIBS) \ $(INTLLIBS) gnunet_helper_audio_record_LDFLAGS = \ - $(WINFLAGS) $(GST_LDFLAGS) + $(GST_LDFLAGS) gnunet_helper_audio_record_CFLAGS = \ $(GST_CFLAGS) -DIS_MIC @@ -170,7 +170,7 @@ gnunet_helper_audio_playback_LDADD = \ $(GST_LIBS) \ $(INTLLIBS) gnunet_helper_audio_playback_LDFLAGS = \ - $(WINFLAGS) $(GST_LDFLAGS) + $(GST_LDFLAGS) gnunet_helper_audio_playback_CFLAGS = \ $(GST_CFLAGS) -DIS_SPEAKER endif @@ -187,7 +187,7 @@ gnunet_service_conversation_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(INTLLIBS) gnunet_service_conversation_LDFLAGS = \ - $(WINFLAGS) + gnunet_conversation_SOURCES = \ gnunet-conversation.c @@ -202,7 +202,7 @@ gnunet_conversation_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(INTLLIBS) gnunet_conversation_LDFLAGS = \ - $(WINFLAGS) + gnunet_conversation_test_SOURCES = \ gnunet-conversation-test.c @@ -212,7 +212,7 @@ gnunet_conversation_test_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(INTLLIBS) gnunet_conversation_test_LDFLAGS = \ - $(WINFLAGS) + test_conversation_api_SOURCES = \ @@ -227,7 +227,7 @@ test_conversation_api_LDADD = \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_conversation_api_LDFLAGS = \ - $(WINFLAGS) -export-dynamic + -export-dynamic test_conversation_api_twocalls_SOURCES = \ test_conversation_api_twocalls.c @@ -241,7 +241,7 @@ test_conversation_api_twocalls_LDADD = \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_conversation_api_twocalls_LDFLAGS = \ - $(WINFLAGS) -export-dynamic + -export-dynamic test_conversation_api_reject_SOURCES = \ test_conversation_api_reject.c @@ -255,7 +255,7 @@ test_conversation_api_reject_LDADD = \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_conversation_api_reject_LDFLAGS = \ - $(WINFLAGS) -export-dynamic + -export-dynamic diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 902be3599..80bdca812 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -24,7 +24,7 @@ libgnunetcore_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetcore_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:1:0 diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index 9fc00bace..ecb02d1c3 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am @@ -30,7 +30,7 @@ libgnunetdatacache_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetdatacache_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:1:0 diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index ba65143af..cd1df4e5e 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am @@ -26,7 +26,7 @@ libgnunetdatastore_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetdatastore_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 1:0:0 bin_PROGRAMS = \ diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 82d76f33c..0b2bc0946 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am @@ -25,7 +25,7 @@ libgnunetdht_la_LIBADD = \ $(XLIB) \ $(LTLIBINTL) libgnunetdht_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 3:0:0 diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 0840242ea..f0efefc4b 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -55,7 +55,7 @@ libgnunetfs_la_LIBADD += \ endif libgnunetfs_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 3:1:1 diff --git a/src/gnsrecord/Makefile.am b/src/gnsrecord/Makefile.am index 81bee5a6b..3da9af9ca 100644 --- a/src/gnsrecord/Makefile.am +++ b/src/gnsrecord/Makefile.am @@ -37,7 +37,7 @@ libgnunetgnsrecord_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetgnsrecord_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am index 39d423506..9f580f0f9 100644 --- a/src/identity/Makefile.am +++ b/src/identity/Makefile.am @@ -46,7 +46,7 @@ libgnunetidentity_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetidentity_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 1:0:0 bin_PROGRAMS = \ diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am index 8abae68a4..5e80ea4c5 100644 --- a/src/namecache/Makefile.am +++ b/src/namecache/Makefile.am @@ -68,7 +68,7 @@ libgnunetnamecache_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetnamecache_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 646effd9b..12d730f36 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am @@ -154,7 +154,7 @@ libgnunetnamestore_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetnamestore_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:1:0 diff --git a/src/nat-auto/Makefile.am b/src/nat-auto/Makefile.am index 14f3f2330..e42ce9491 100644 --- a/src/nat-auto/Makefile.am +++ b/src/nat-auto/Makefile.am @@ -43,7 +43,7 @@ libgnunetnatauto_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) @EXT_LIBS@ libgnunetnatauto_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 gnunet_service_nat_auto_SOURCES = \ diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 67f5e4dbc..63a11f1fe 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am @@ -59,7 +59,7 @@ libgnunetnatnew_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) @EXT_LIBS@ libgnunetnatnew_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 2:0:0 gnunet_service_nat_SOURCES = \ diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index 3a79cdd97..85ae4d3be 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am @@ -29,7 +29,7 @@ libgnunetnse_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetnse_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 7d1204100..831162366 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am @@ -27,7 +27,7 @@ libgnunetpeerinfo_la_LIBADD = \ $(XLIB) \ $(LTLIBINTL) libgnunetpeerinfo_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/reclaim-attribute/Makefile.am b/src/reclaim-attribute/Makefile.am index cbbcb37d6..490e77398 100644 --- a/src/reclaim-attribute/Makefile.am +++ b/src/reclaim-attribute/Makefile.am @@ -22,7 +22,7 @@ libgnunetreclaimattribute_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunetreclaimattribute_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index 851b0d71e..51b9b9c5b 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am @@ -111,7 +111,7 @@ libgnunetreclaim_la_LIBADD = \ $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ $(GN_LIBINTL) $(XLIB) libgnunetreclaim_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 gnunet_reclaim_SOURCES = \ diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index ba5e0af00..2fd00dd09 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am @@ -45,7 +45,7 @@ libgnunetregexblock_la_LIBADD = \ $(XLIB) \ $(LTLIBINTL) libgnunetregexblock_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 1:0:0 diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am index a6fff3524..5e48fb29f 100644 --- a/src/revocation/Makefile.am +++ b/src/revocation/Makefile.am @@ -50,7 +50,7 @@ libgnunetrevocation_la_LIBADD = \ $(LIBGCRYPT_LIBS) \ $(GN_LIBINTL) $(XLIB) -lgcrypt libgnunetrevocation_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 libexec_PROGRAMS = \ diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am index 0c739589f..b9de6b5e3 100644 --- a/src/rps/Makefile.am +++ b/src/rps/Makefile.am @@ -36,7 +36,7 @@ libgnunetrps_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetrps_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 # Fix 'created both with libtool and without' error: libgnunetrps_la_CFLAGS = $(AM_CFLAGS) diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am index bde35da2d..6d69d58d8 100644 --- a/src/statistics/Makefile.am +++ b/src/statistics/Makefile.am @@ -21,7 +21,7 @@ libgnunetstatistics_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetstatistics_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 2:0:0 libexec_PROGRAMS = \ diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index ae69ee8bc..8580d200c 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am @@ -21,7 +21,7 @@ libgnunetfriends_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) libgnunetfriends_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 8221b7847..d776e99e4 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -185,7 +185,7 @@ libgnunettransport_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunettransport_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 4:0:2 libgnunettransportapplication_la_SOURCES = \ @@ -194,7 +194,7 @@ libgnunettransportapplication_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) libgnunettransportapplication_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 @@ -204,7 +204,7 @@ libgnunettransportcore_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunettransportcore_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 libgnunettransportcommunicator_la_SOURCES = \ @@ -213,7 +213,7 @@ libgnunettransportcommunicator_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunettransportcommunicator_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 @@ -223,7 +223,7 @@ libgnunettransportmonitor_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) libgnunettransportmonitor_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \ + $(GN_LIB_LDFLAGS) \ -version-info 0:0:0 -- cgit v1.2.3