makefile update, removal of debugging DEFINES

[oweals/gnunet.git] / src / transport / Makefile.am

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 88d43e279dd27fc4333f578444293bbc1a28d97d..5d19525b98cefdf09e437770fc195e526158375d 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -15,7 +15,8 @@ lib_LTLIBRARIES = \
   libgnunettransport.la
 
 libgnunettransport_la_SOURCES = \
-  transport_api.c transport.h
+  transport_api.c transport.h \
+  transport_api_blacklist.c
 libgnunettransport_la_LIBADD = \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/hello/libgnunethello.la \
@@ -38,7 +39,8 @@ gnunet_transport_LDADD = \
   $(GN_LIBINTL)
 
 gnunet_service_transport_SOURCES = \
- gnunet-service-transport.c 
+ gnunet-service-transport.c plugin_transport.h \
+ gnunet-service-transport_blacklist.c gnunet-service-transport_blacklist.h
 gnunet_service_transport_LDADD = \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -48,6 +50,7 @@ gnunet_service_transport_LDADD = \
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_transport_tcp.la \
+  libgnunet_plugin_transport_udp.la \
   libgnunet_plugin_transport_template.la 
 # TODO: add udp, http, nat, etc.
 
@@ -55,7 +58,6 @@ libgnunet_plugin_transport_tcp_la_SOURCES = \
   plugin_transport_tcp.c
 libgnunet_plugin_transport_tcp_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/resolver/libgnunetresolver.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_tcp_la_LDFLAGS = \
@@ -68,21 +70,50 @@ libgnunet_plugin_transport_template_la_LIBADD = \
 libgnunet_plugin_transport_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
+libgnunet_plugin_transport_udp_la_SOURCES = \
+  plugin_transport_udp.c
+libgnunet_plugin_transport_udp_la_LIBADD = \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
+libgnunet_plugin_transport_udp_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
 
 check_PROGRAMS = \
- test_transport_api 
-# TODO: add tests for tcp, udp, http, nat, etc.
+ test_transport_api_tcp \
+ test_transport_api_udp
+# test_plugin_transport \
+# test_plugin_transport_udp
+# TODO: add tests for http, nat, etc.
 
 TESTS = $(check_PROGRAMS)
 
-test_transport_api_SOURCES = \
+test_transport_api_tcp_SOURCES = \
  test_transport_api.c
-test_transport_api_LDADD = \
+test_transport_api_tcp_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_transport_api_udp_SOURCES = \
+ test_transport_api.c
+test_transport_api_udp_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
+test_plugin_transport_SOURCES = \
+ test_plugin_transport.c
+test_plugin_transport_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
+test_plugin_transport_udp_SOURCES = \
+ test_plugin_transport_udp.c
+test_plugin_transport_udp_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \
   test_transport_api_data.conf \
   test_transport_api_peer1.conf \
-  test_transport_api_peer2.conf
+  test_transport_api_peer2.conf \
+  test_plugin_transport_data.conf