-bump name to 97

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

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index c3d4781385b9c2c359f8f54eac4d38fe36dda0c5..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
@@ -23,8 +23,8 @@ AM_CLFAGS = -g
 EXP_LIB = \
  libgnunetmeshenc.la
 
-EXP_LIBEXEC = \
- gnunet-service-mesh-enc
+#EXP_LIBEXEC = \
+# gnunet-service-mesh-enc
 
 libexec_PROGRAMS = \
  gnunet-service-mesh $(EXP_LIBEXEC)
@@ -103,6 +103,12 @@ 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)
@@ -124,7 +130,7 @@ endif
 
 
 if HAVE_TESTING
-noinst_LIBRARIES = libgnunetmeshtest.a $(noinst_LIB_EXP)
+ noinst_LIBRARIES = libgnunetmeshtest.a $(noinst_LIB_EXP)
 endif
 
 libgnunetmeshtest_a_SOURCES = \
@@ -132,9 +138,9 @@ 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 = \
@@ -155,11 +161,11 @@ 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_single_SOURCES = \