[GNUnet-SVN] r27557 - in gnunet/src: . gns

[gnunet]

Author: grothoff
Date: 2013-06-25 12:00:42 +0200 (Tue, 25 Jun 2013)
New Revision: 27557

Modified:
   gnunet/src/Makefile.am
   gnunet/src/gns/Makefile.am
Log:
-trying to fix #2902, always build dns code and fix dependencies

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2013-06-25 09:58:00 UTC (rev 27556)
+++ gnunet/src/Makefile.am      2013-06-25 10:00:42 UTC (rev 27557)
@@ -3,11 +3,9 @@
 #endif
 
 if HAVE_LIBIDN
- DNS = dns
  EXIT = exit
  PT = pt
 else
- DNS =
  EXIT =
  PT =
 endif
@@ -18,10 +16,10 @@
 
 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 @@
   mesh \
   lockmanager \
   stream \
+  dns \
   fs \
   $(LINUX_DIR) \
   $(MINGW_DIR) \

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2013-06-25 09:58:00 UTC (rev 27556)
+++ gnunet/src/gns/Makefile.am  2013-06-25 10:00:42 UTC (rev 27557)
@@ -87,9 +87,13 @@
   $(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 @@
   $(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)