diff options
-rw-r--r-- | contrib/def.tex | 21 | ||||
-rw-r--r-- | src/ats/Makefile.am | 6 | ||||
-rw-r--r-- | src/mesh/Makefile.am | 4 | ||||
-rw-r--r-- | src/testbed/Makefile.am | 2 |
4 files changed, 19 insertions, 14 deletions
diff --git a/contrib/def.tex b/contrib/def.tex index 535c5a7f8..669302b08 100644 --- a/contrib/def.tex +++ b/contrib/def.tex | |||
@@ -1,17 +1,18 @@ | |||
1 | \def\prefix{} | 1 | \def\prefix{} |
2 | \def\name{Christian Grothoff} | 2 | \def\name{Sree Harsha Totakura} |
3 | \def\suffix{PhD (UCLA)} | 3 | \def\suffix{M.Sc.} |
4 | \def\phone{+49-89-289-18040} | 4 | \def\phone{+49-89-289-18011} |
5 | \def\fax{+49-89-289-18033} | 5 | \def\fax{+49-89-289-18033} |
6 | \def\email{christian@grothoff.org} | 6 | \def\email{sreeharsha@totakura.in} |
7 | \def\homepage{http://grothoff.org/christian/} | 7 | \def\homepage{http://sreeharsha.totakura.in/} |
8 | \def\orga{Technische Universit\"at M\"unchen} | 8 | \def\orga{Technische Universit\"at M\"unchen} |
9 | \def\departmentde{Department of Computer Science} | 9 | \def\departmentde{Department of Computer Science} |
10 | \def\departmenten{Department of Computer Science} | 10 | \def\departmenten{Department of Computer Science} |
11 | \def\subdepartmentde{Network Architectures and Services} | 11 | \def\subdepartmentde{Network Architectures and Services} |
12 | \def\subdepartmenten{Network Architectures and Services} | 12 | \def\subdepartmenten{Network Architectures and Services} |
13 | \def\jobtitlegerman{Emmy-Noether Research Group Leader} | 13 | \def\jobtitlegerman{Free Secure Network Systems Group} |
14 | \def\jobtitleenglish{Emmy-Noether Research Group Leader} | 14 | \def\jobtitleenglish{Free Secure Network Systems Group} |
15 | \def\gpglineone{1964 7543 F786 1D3B F4E6} | 15 | \def\gpglineone{8E68 1D8A 25AB B102 AFB5} |
16 | \def\gpglinetwo{4FF7 BF60 708B 4842 6C7E} | 16 | \def\gpglinetwo{4B40 3B6F 8AF1 43C2 1F3B} |
17 | \def\gns{TNH1H4O288S26EBR369F6OCE0MIRIQT2U74N2FIMKMGA31HIT2IG/grothoff} | 17 | \def\gns{LOC36VTJD3IRULMM6C20TGE6D3SVEAJOHI9KRI5KAQVQ87UJGPJG/totakura} |
18 | |||
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 60300f07c..663759623 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am | |||
@@ -50,7 +50,7 @@ libgnunetats_la_LDFLAGS = \ | |||
50 | libgnunet_plugin_ats_proportional_la_SOURCES = \ | 50 | libgnunet_plugin_ats_proportional_la_SOURCES = \ |
51 | plugin_ats_proportional.c | 51 | plugin_ats_proportional.c |
52 | libgnunet_plugin_ats_proportional_la_LIBADD = \ | 52 | libgnunet_plugin_ats_proportional_la_LIBADD = \ |
53 | libgnunetats.la \ | 53 | libgnunetats.la \ |
54 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 54 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
55 | $(top_builddir)/src/util/libgnunetutil.la \ | 55 | $(top_builddir)/src/util/libgnunetutil.la \ |
56 | $(LTLIBINTL) | 56 | $(LTLIBINTL) |
@@ -64,7 +64,7 @@ if HAVE_LIBGLPK | |||
64 | libgnunet_plugin_ats_mlp_la_SOURCES = \ | 64 | libgnunet_plugin_ats_mlp_la_SOURCES = \ |
65 | plugin_ats_mlp.c | 65 | plugin_ats_mlp.c |
66 | libgnunet_plugin_ats_mlp_la_LIBADD = \ | 66 | libgnunet_plugin_ats_mlp_la_LIBADD = \ |
67 | libgnunetats.la \ | 67 | libgnunetats.la \ |
68 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 68 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
69 | $(top_builddir)/src/util/libgnunetutil.la | 69 | $(top_builddir)/src/util/libgnunetutil.la |
70 | libgnunet_plugin_ats_mlp_la_LDFLAGS = \ | 70 | libgnunet_plugin_ats_mlp_la_LDFLAGS = \ |
@@ -504,7 +504,7 @@ test_ats_solver_convergence_ril_LDADD = \ | |||
504 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 504 | $(top_builddir)/src/statistics/libgnunetstatistics.la |
505 | 505 | ||
506 | EXTRA_DIST = \ | 506 | EXTRA_DIST = \ |
507 | ats.h \ | 507 | ats.h perf_ats.h \ |
508 | plugin_ats_proportional.h \ | 508 | plugin_ats_proportional.h \ |
509 | plugin_ats_mlp.h \ | 509 | plugin_ats_mlp.h \ |
510 | plugin_ats_ril.h \ | 510 | plugin_ats_ril.h \ |
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index ffcee8c0e..c8e39ffc8 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am | |||
@@ -190,4 +190,6 @@ endif | |||
190 | 190 | ||
191 | EXTRA_DIST = \ | 191 | EXTRA_DIST = \ |
192 | mesh.h mesh_protocol.h \ | 192 | mesh.h mesh_protocol.h \ |
193 | test_mesh.conf | 193 | test_mesh.conf \ |
194 | test_mesh_drop.conf | ||
195 | |||
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index c52fc1f16..6259f4404 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am | |||
@@ -370,6 +370,8 @@ gnunet_service_test_barriers_LDADD = \ | |||
370 | EXTRA_DIST = \ | 370 | EXTRA_DIST = \ |
371 | test_testbed_api.conf \ | 371 | test_testbed_api.conf \ |
372 | test_testbed_api_test_timeout.conf \ | 372 | test_testbed_api_test_timeout.conf \ |
373 | test_testbed_api_template.conf \ | ||
374 | test_testbed_logger_api.conf \ | ||
373 | test_testbed_api_testbed_run_topologyring.conf \ | 375 | test_testbed_api_testbed_run_topologyring.conf \ |
374 | test_testbed_api_testbed_run_topologyclique.conf \ | 376 | test_testbed_api_testbed_run_topologyclique.conf \ |
375 | test_testbed_api_testbed_run_topologyline.conf \ | 377 | test_testbed_api_testbed_run_topologyline.conf \ |