- begin work on enhanced multipart receiving

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

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 8e6ea38d4ddebbbd8ad6d66c8473fe6ae5a18104..a81ac4589fabcdff61d5926e13399b3696c0429a 100644 (file)
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
@@ -20,9 +20,6 @@ plugindir = $(libdir)/gnunet
 
 AM_CLFAGS = -g
 
-EXP_LIBEXEC = 
-# gnunet-service-mesh-enc
-
 libexec_PROGRAMS = \
  gnunet-service-mesh $(EXP_LIBEXEC)
 
@@ -55,7 +52,7 @@ libgnunetmesh_la_LIBADD = \
   $(LTLIBINTL)
 libgnunetmesh_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 3:0:0
+  -version-info 4:0:0
 
 gnunet_mesh_SOURCES = \
   gnunet-mesh.c
@@ -66,9 +63,15 @@ gnunet_mesh_DEPENDENCIES = \
   libgnunetmesh.la
 
 gnunet_service_mesh_SOURCES = \
- gnunet-service-mesh.c \
+ gnunet-service-mesh_tunnel.c \
+ gnunet-service-mesh_connection.c \
+ gnunet-service-mesh_channel.c \
+ gnunet-service-mesh_local.c \
+ gnunet-service-mesh_peer.c \
+ gnunet-service-mesh_dht.c \
  mesh_path.c \
- mesh_common.c
+ mesh_common.c \
+ gnunet-service-mesh.c
 gnunet_service_mesh_CFLAGS = $(AM_CFLAGS)
 gnunet_service_mesh_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -86,30 +89,9 @@ if LINUX
   gnunet_service_mesh_LDFLAGS = -lrt
 endif
 
-gnunet_service_mesh_enc_SOURCES = \
- gnunet-service-mesh-enc.c \
- mesh_path.c \
- mesh_common.c
-gnunet_service_mesh_enc_CFLAGS = $(AM_CFLAGS)
-gnunet_service_mesh_enc_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/block/libgnunetblock.la
-gnunet_service_mesh_enc_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/block/libgnunetblock.la
-if LINUX
-  gnunet_service_mesh_enc_LDFLAGS = -lrt
-endif
-
 
 if HAVE_TESTING
-noinst_LIBRARIES = libgnunetmeshtest.a $(noinst_LIB_EXP)
+ noinst_LIBRARIES = libgnunetmeshtest.a $(noinst_LIB_EXP)
 endif
 
 libgnunetmeshtest_a_SOURCES = \
@@ -129,9 +111,7 @@ check_PROGRAMS = \
   test_mesh_small_signal  \
   test_mesh_small_speed  \
   test_mesh_small_speed_ack  \
-  test_mesh_small_speed_nobuf  \
   test_mesh_small_speed_backwards  \
-  test_mesh_small_speed_nobuf_backwards \
   test_mesh_small_speed_reliable \
   test_mesh_small_speed_reliable_backwards
 endif