[GNUnet-SVN] [gnunet-gtk] branch master updated: fix ftbfs

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet-gtk.

The following commit(s) were added to refs/heads/master by this push:
     new 5e1df7d1 fix ftbfs
5e1df7d1 is described below

commit 5e1df7d11813dfdf3b3f24aaae1707101298e69a
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Jun 26 12:10:36 2018 +0200

    fix ftbfs
---
 src/conversation/Makefile.am |  2 +-
 src/fs/Makefile.am           |  1 -
 src/namestore/Makefile.am    | 11 +----------
 src/setup/Makefile.am        |  2 +-
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 03bf949b..a3120536 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -38,7 +38,7 @@ gnunet_conversation_gtk_LDADD = \
   $(top_builddir)/src/lib/libgnunetgtk.la \
   @GTK_LIBS@ \
   @GLADE_LIBS@ @GNUNET_LIBS@ \
-  -lgnunetutil -lgnunetidentity -lgnunetconversation -lgnunetspeaker 
-lgnunetmicrophone -lgnunetnamestore -lgnunetdnsparser -lgnunetgnsrecord 
-lgnunetgns -lgnunetfs -lextractor \
+  -lgnunetutil -lgnunetidentity -lgnunetconversation -lgnunetspeaker 
-lgnunetmicrophone -lgnunetnamestore -lgnunetgnsrecord -lgnunetgns -lgnunetfs 
-lextractor \
   $(INTLLIBS)
 gnunet_conversation_gtk_LDFLAGS = \
   -export-dynamic
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index b011d7ca..6faea619 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -35,7 +35,6 @@ gnunet_fs_gtk_LDADD = \
   -lextractor \
   -lgnunetutil \
   -lgnunetarm \
-  -lgnunetdnsparser \
   -lgnunetfs \
   -lgnunetgns \
   -lgnunetgnsrecord \
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index e8320eb8..4bd69fc1 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -24,7 +24,7 @@ gnunet_namestore_gtk_LDADD = \
   -lgmodule-2.0 \
   @GTK_LIBS@ @GNUNET_LIBS@ @GLADE_LIBS@ @QR_LIBS@ \
   $(WINLIBS) \
-  -lgnunetutil -lgnunetgnsrecord -lgnunetnamestore -lgnunetdnsparser \
+  -lgnunetutil -lgnunetgnsrecord -lgnunetnamestore \
   -lgnunetidentity \
   $(INTLLIBS)
 gnunet_namestore_gtk_CFLAGS = \
@@ -89,7 +89,6 @@ libgnunet_plugin_gtk_namestore_box_la_CFLAGS = \
   @GLADE_CFLAGS@
 libgnunet_plugin_gtk_namestore_box_la_LIBADD = \
   @GNUNET_LIBS@ \
-  -lgnunetdnsparser \
   -lgnunetutil -lgnutls
 libgnunet_plugin_gtk_namestore_box_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -102,7 +101,6 @@ libgnunet_plugin_gtk_namestore_cname_la_CFLAGS = \
   @GLADE_CFLAGS@
 libgnunet_plugin_gtk_namestore_cname_la_LIBADD = \
   @GNUNET_LIBS@ \
-  -lgnunetdnsparser \
   -lgnunetutil
 libgnunet_plugin_gtk_namestore_cname_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -115,7 +113,6 @@ libgnunet_plugin_gtk_namestore_gns2dns_la_CFLAGS = \
   @GLADE_CFLAGS@
 libgnunet_plugin_gtk_namestore_gns2dns_la_LIBADD = \
   @GNUNET_LIBS@ \
-  -lgnunetdnsparser \
   -lgnunetutil
 libgnunet_plugin_gtk_namestore_gns2dns_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -128,7 +125,6 @@ libgnunet_plugin_gtk_namestore_leho_la_CFLAGS = \
   @GLADE_CFLAGS@
 libgnunet_plugin_gtk_namestore_leho_la_LIBADD = \
   @GNUNET_LIBS@ \
-  -lgnunetdnsparser \
   -lgnunetutil
 libgnunet_plugin_gtk_namestore_leho_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -141,7 +137,6 @@ libgnunet_plugin_gtk_namestore_mx_la_CFLAGS = \
   @GLADE_CFLAGS@
 libgnunet_plugin_gtk_namestore_mx_la_LIBADD = \
   @GNUNET_LIBS@ \
-  -lgnunetdnsparser \
   -lgnunetutil
 libgnunet_plugin_gtk_namestore_mx_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -178,7 +173,6 @@ libgnunet_plugin_gtk_namestore_ptr_la_CFLAGS = \
   @GLADE_CFLAGS@
 libgnunet_plugin_gtk_namestore_ptr_la_LIBADD = \
   @GNUNET_LIBS@ \
-  -lgnunetdnsparser \
   -lgnunetutil
 libgnunet_plugin_gtk_namestore_ptr_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -191,7 +185,6 @@ libgnunet_plugin_gtk_namestore_soa_la_CFLAGS = \
   @GLADE_CFLAGS@
 libgnunet_plugin_gtk_namestore_soa_la_LIBADD = \
   @GNUNET_LIBS@ \
-  -lgnunetdnsparser \
   -lgnunetutil
 libgnunet_plugin_gtk_namestore_soa_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -204,7 +197,6 @@ libgnunet_plugin_gtk_namestore_srv_la_CFLAGS = \
   @GLADE_CFLAGS@
 libgnunet_plugin_gtk_namestore_srv_la_LIBADD = \
   @GNUNET_LIBS@ \
-  -lgnunetdnsparser \
   -lgnunetutil
 libgnunet_plugin_gtk_namestore_srv_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -217,7 +209,6 @@ libgnunet_plugin_gtk_namestore_tlsa_la_CFLAGS = \
   @GLADE_CFLAGS@
 libgnunet_plugin_gtk_namestore_tlsa_la_LIBADD = \
   @GNUNET_LIBS@ \
-  -lgnunetdnsparser \
   -lgnunetutil -lgnutls
 libgnunet_plugin_gtk_namestore_tlsa_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index ae658ab7..7f97b4ef 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -33,7 +33,7 @@ gnunet_setup_LDADD = \
   $(top_builddir)/src/lib/libgnunetgtk.la \
   @GTK_LIBS@ @GNUNET_LIBS@ @GLADE_LIBS@ \
   $(WINLIBS) \
-  -lgnunetutil -lgnunetnatauto -lgnunettun \
+  -lgnunetutil -lgnunetnatauto \
   $(INTLLIBS)
 gnunet_setup_CFLAGS = \
   @GTK_CFLAGS@ \

-- 
To stop receiving notification emails like this one, please contact
address@hidden