-bump name to 97

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

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index f602f40c452cfbcf34e47e4ddd4d5f0f72268805..c8c09545fcd64c9614482ba4c407ca6da5169b79 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,6 +20,12 @@ plugindir = $(libdir)/gnunet
 
 AM_CLFAGS = -g
 
+EXP_LIB = \
+ libgnunetmeshenc.la
+
+#EXP_LIBEXEC = \
+# gnunet-service-mesh-enc
+
 libexec_PROGRAMS = \
  gnunet-service-mesh $(EXP_LIBEXEC)
 
@@ -54,6 +60,18 @@ libgnunetmesh_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 3:0:0
 
+
+libgnunetmeshenc_la_SOURCES = \
+  mesh_api_enc.c mesh_common.c
+libgnunetmeshenc_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIB) \
+  $(LTLIBINTL)
+libgnunetmeshenc_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+  -version-info 1:0:0
+
+
 gnunet_mesh_SOURCES = \
   gnunet-mesh.c
 gnunet_mesh_LDADD = \
@@ -83,8 +101,36 @@ if LINUX
   gnunet_service_mesh_LDFLAGS = -lrt
 endif
 
+gnunet_service_mesh_enc_SOURCES = \
+ gnunet-service-mesh-enc.c \
+ gnunet-service-mesh_tunnel.c \
+ gnunet-service-mesh_channel.c \
+ gnunet-service-mesh_connection.c \
+ gnunet-service-mesh_peer.c \
+ gnunet-service-mesh_dht.c \
+ gnunet-service-mesh_local.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 = \
@@ -92,45 +138,46 @@ libgnunetmeshtest_a_SOURCES = \
 libgnunetmeshtest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la
+ $(top_builddir)/src/mesh/libgnunetmeshenc.la
 libgnunetmeshtest_a_DEPENDENCIES = \
-  libgnunetmesh.la
+  libgnunetmeshenc.la
 
 if HAVE_TESTING
 check_PROGRAMS = \
-  test_mesh_local \
   test_mesh_single \
+  test_mesh_local \
   test_mesh_small_forward \
   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_nobuf_backwards \
+  test_mesh_small_speed_reliable \
+  test_mesh_small_speed_reliable_backwards
 endif
 
 ld_mesh_test_lib = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/mesh/libgnunetmeshtest.a \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/mesh/libgnunetmeshenc.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la
 
 dep_mesh_test_lib = \
-  libgnunetmesh.la \
+  libgnunetmeshenc.la \
   libgnunetmeshtest.a
 
-test_mesh_local_SOURCES = \
-  test_mesh_local.c
-test_mesh_local_LDADD = $(ld_mesh_test_lib)
-test_mesh_local_DEPENDENCIES = $(dep_mesh_test_lib)
-
-
 test_mesh_single_SOURCES = \
   test_mesh_single.c
 test_mesh_single_LDADD = $(ld_mesh_test_lib)
 test_mesh_single_DEPENDENCIES = $(dep_mesh_test_lib)
 
+test_mesh_local_SOURCES = \
+  test_mesh_local.c
+test_mesh_local_LDADD = $(ld_mesh_test_lib)
+test_mesh_local_DEPENDENCIES = $(dep_mesh_test_lib)
+
 test_mesh_small_forward_SOURCES = \
   test_mesh_small.c
 test_mesh_small_forward_LDADD = $(ld_mesh_test_lib)
@@ -166,6 +213,16 @@ test_mesh_small_speed_nobuf_backwards_SOURCES = \
 test_mesh_small_speed_nobuf_backwards_LDADD = $(ld_mesh_test_lib)
 test_mesh_small_speed_nobuf_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
 
+test_mesh_small_speed_reliable_SOURCES = \
+  test_mesh_small.c
+test_mesh_small_speed_reliable_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_speed_reliable_DEPENDENCIES = $(dep_mesh_test_lib)
+
+test_mesh_small_speed_reliable_backwards_SOURCES = \
+  test_mesh_small.c
+test_mesh_small_speed_reliable_backwards_LDADD = $(ld_mesh_test_lib)
+test_mesh_small_speed_reliable_backwards_DEPENDENCIES = $(dep_mesh_test_lib)
+
 
 if ENABLE_TEST_RUN
 TESTS = \