-do not compile vpn/exit/pt/dns on non-Linux systems

diff --git a/src/Makefile.am b/src/Makefile.am
index 36e87f82bd9f9b46b0d17d430eda992214bf3e12..56fdd0978df9fe590f4ab2b68f644d98d11a4683 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,12 @@ if HAVE_EXPERIMENTAL
  EXP_DIR = chat dv 
 endif
 
+if LINUX
+# All of these currently only work on GNU/Linux
+ LINUX_DIR = dns exit vpn pt
+endif
+
+
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -31,9 +37,6 @@ SUBDIRS = \
   topology \
   fs \
   mesh \
-  dns \
-  exit \
-  vpn \
-  pt \
+  $(LINUX_DIR) \
   integration-tests \
   $(EXP_DIR) 

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index fc6c8f200629a327cacbc450374fa83d064e80cf..b7d9956d3c8a56030b71d8daf011ea2baaddc515 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -368,7 +368,7 @@ test_transport_api_tcp_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
  $(top_builddir)/src/transport/libgnunettransporttesting.la
-  
+
 test_transport_api_bidirectional_connect_SOURCES = \
  test_transport_api_bidirectional_connect.c
 test_transport_api_bidirectional_connect_LDADD = \
@@ -394,7 +394,7 @@ test_transport_api_restart_2peers_LDADD = \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
-  
+
 test_transport_api_limited_sockets_tcp_SOURCES = \
  test_transport_api_limited_sockets.c
 test_transport_api_limited_sockets_tcp_LDADD = \
@@ -434,7 +434,7 @@ test_transport_api_timeout_http_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
- 
+
 test_transport_api_timeout_https_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_https_LDADD = \
@@ -442,7 +442,7 @@ test_transport_api_timeout_https_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
- 
+
 test_transport_api_reliability_tcp_nat_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_tcp_nat_LDADD = \
@@ -506,7 +506,7 @@ test_transport_api_http_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
- 
+
  test_transport_api_http_nat_SOURCES = \
  test_transport_api.c
 test_transport_api_http_nat_LDADD = \