-trying to fix #2902, always build dns code and fix dependencies

diff --git a/src/Makefile.am b/src/Makefile.am
index 91b4daf51f07cd361c1d4328b4a4b489904a3522..62a08cb5aa9c357a832236baa04ffe82c964a912 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,11 +3,9 @@
 #endif
 
 if HAVE_LIBIDN
- DNS = dns
  EXIT = exit
  PT = pt
 else
- DNS =
  EXIT =
  PT =
 endif
@@ -18,10 +16,10 @@ endif
 
 if LINUX
 # All of these currently only work on GNU/Linux
- LINUX_DIR = $(DNS) $(EXIT) vpn $(PT)
+ LINUX_DIR = $(EXIT) vpn $(PT)
 endif
 if MINGW
- MINGW_DIR = $(DNS) vpn $(EXIT)
+ MINGW_DIR = vpn $(EXIT)
 endif
 
 if HAVE_MYSQL
@@ -65,6 +63,7 @@ SUBDIRS = \
   mesh \
   lockmanager \
   stream \
+  dns \
   fs \
   $(LINUX_DIR) \
   $(MINGW_DIR) \

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index bb8f0bf410375c7dbe87a489a06bf40edc8355f6..852f7ff6a5508fd2521fbe7ddf0d69daa64e559c 100644 (file)
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -87,9 +87,13 @@ gnunet_dns2gns_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/dns/libgnunetdnsparser.la \
-       $(top_builddir)/src/dns/libgnunetdnsstub.la \
+  $(top_builddir)/src/dns/libgnunetdnsstub.la \
   $(GN_LIBINTL)
 gnunet_dns2gns_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/dns/libgnunetdnsparser.la \
+  $(top_builddir)/src/dns/libgnunetdnsstub.la \
   libgnunetgns.la
 
 gnunet_gns_proxy_SOURCES = \
@@ -131,21 +135,21 @@ gnunet_service_gns_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetgns_common.la \
-       $(top_builddir)/src/dns/libgnunetdns.la \
-       $(top_builddir)/src/dns/libgnunetdnsparser.la \
-       $(top_builddir)/src/dht/libgnunetdht.la \
-       $(top_builddir)/src/namestore/libgnunetnamestore.la \
-       $(USE_VPN) \
+  $(top_builddir)/src/dns/libgnunetdns.la \
+  $(top_builddir)/src/dns/libgnunetdnsparser.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(USE_VPN) \
   $(GN_LIBINTL)
 gnunet_service_gns_DEPENDENCIES = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetgns_common.la \
-       $(top_builddir)/src/dns/libgnunetdns.la \
-       $(top_builddir)/src/dns/libgnunetdnsparser.la \
-       $(top_builddir)/src/dht/libgnunetdht.la \
-       $(top_builddir)/src/namestore/libgnunetnamestore.la \
-       $(USE_VPN)
+  $(top_builddir)/src/dns/libgnunetdns.la \
+  $(top_builddir)/src/dns/libgnunetdnsparser.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(USE_VPN)