remove port from transport section because it was getting in the way of making sense...

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

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index db5a76cfd63fa32518c38095ec9ac968a67fa863..d0187af8b2e2dd1addc33a2bb79e4a675f170cf0 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -32,6 +32,7 @@ endif
 if HAVE_PCAP
 if LINUX
 WANBIN = gnunet-transport-wlan-helper
+WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
 endif
 endif
 
@@ -72,7 +73,7 @@ bin_SCRIPTS = \
 
 gnunet_nat_server_SOURCES = \
  $(NATSERVER)
- 
+
 gnunet_transport_wlan_helper_SOURCES = \
  gnunet-transport-wlan-helper.c         
 gnunet_transport_wlan_helper_LDADD = \
@@ -103,6 +104,7 @@ plugin_LTLIBRARIES = \
   libgnunet_plugin_transport_udp.la \
   $(HTTP_PLUGIN_LA) \
   $(HTTPS_PLUGIN_LA) \
+  $(WLAN_PLUGIN_LA) \
   libgnunet_plugin_transport_template.la
 # TODO: add nat, etc.
 
@@ -123,6 +125,20 @@ libgnunet_plugin_transport_template_la_LIBADD = \
 libgnunet_plugin_transport_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
+if HAVE_PCAP
+if LINUX
+libgnunet_plugin_transport_wlan_la_SOURCES = \
+       plugin_transport_wlan.c
+libgnunet_plugin_transport_wlan_la_LIBADD = \
+       $(top_builddir)/src/hello/libgnunethello.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la \
+       $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+       $(top_builddir)/src/util/libgnunetutil.la 
+libgnunet_plugin_transport_wlan_la_LDFLAGS = \
+       $(GN_PLUGIN_LDFLAGS)
+endif
+endif
+
 libgnunet_plugin_transport_udp_la_SOURCES = \
   plugin_transport_udp.c
 libgnunet_plugin_transport_udp_la_LIBADD = \
@@ -157,7 +173,7 @@ libgnunet_plugin_transport_http_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
  
 libgnunet_plugin_transport_https_la_SOURCES = \
-  plugin_transport_https.c
+  plugin_transport_http.c
 libgnunet_plugin_transport_https_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -166,7 +182,9 @@ libgnunet_plugin_transport_https_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_https_la_LDFLAGS = \
  $(GN_LIBMHD) \
- $(GN_PLUGIN_LDFLAGS) 
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_transport_https_la_CFLAGS = \
+ $(CFLAGS) -DBUILD_HTTPS  
 endif
 
 check_PROGRAMS = \
@@ -278,13 +296,13 @@ test_transport_api_https_SOURCES = \
 test_transport_api_https_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la  
- 
+
 test_transport_api_reliability_https_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_https_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
-     
+
 endif
 
 EXTRA_DIST = \