From cbe126c37f2e6fdccdbe20e723c06b8b0b12d1c6 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 23 Dec 2013 19:22:27 +0000
Subject: -fix build system issues

---
 contrib/def.tex         | 21 +++++++++++----------
 src/ats/Makefile.am     |  6 +++---
 src/mesh/Makefile.am    |  4 +++-
 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 @@
 \def\prefix{}
-\def\name{Christian Grothoff}
-\def\suffix{PhD (UCLA)}
-\def\phone{+49-89-289-18040}
+\def\name{Sree Harsha Totakura}
+\def\suffix{M.Sc.}
+\def\phone{+49-89-289-18011}
 \def\fax{+49-89-289-18033}
-\def\email{christian@grothoff.org}
-\def\homepage{http://grothoff.org/christian/}
+\def\email{sreeharsha@totakura.in}
+\def\homepage{http://sreeharsha.totakura.in/}
 \def\orga{Technische Universit\"at M\"unchen}
 \def\departmentde{Department of Computer Science}
 \def\departmenten{Department of Computer Science}
 \def\subdepartmentde{Network Architectures and Services}
 \def\subdepartmenten{Network Architectures and Services}
-\def\jobtitlegerman{Emmy-Noether Research Group Leader}
-\def\jobtitleenglish{Emmy-Noether Research Group Leader}
-\def\gpglineone{1964 7543 F786 1D3B F4E6}
-\def\gpglinetwo{4FF7 BF60 708B 4842 6C7E}
-\def\gns{TNH1H4O288S26EBR369F6OCE0MIRIQT2U74N2FIMKMGA31HIT2IG/grothoff}
+\def\jobtitlegerman{Free Secure Network Systems Group}
+\def\jobtitleenglish{Free Secure Network Systems Group}
+\def\gpglineone{8E68 1D8A 25AB B102 AFB5}
+\def\gpglinetwo{4B40 3B6F 8AF1 43C2 1F3B}
+\def\gns{LOC36VTJD3IRULMM6C20TGE6D3SVEAJOHI9KRI5KAQVQ87UJGPJG/totakura}
+
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 = \
 libgnunet_plugin_ats_proportional_la_SOURCES = \
   plugin_ats_proportional.c
 libgnunet_plugin_ats_proportional_la_LIBADD = \
-	libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
@@ -64,7 +64,7 @@ if HAVE_LIBGLPK
 libgnunet_plugin_ats_mlp_la_SOURCES = \
   plugin_ats_mlp.c
 libgnunet_plugin_ats_mlp_la_LIBADD = \
-	libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_ats_mlp_la_LDFLAGS = \
@@ -504,7 +504,7 @@ test_ats_solver_convergence_ril_LDADD = \
 	$(top_builddir)/src/statistics/libgnunetstatistics.la
 
 EXTRA_DIST = \
-  ats.h \
+  ats.h perf_ats.h \
   plugin_ats_proportional.h \
   plugin_ats_mlp.h \
   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
 
 EXTRA_DIST = \
   mesh.h mesh_protocol.h \
-  test_mesh.conf
+  test_mesh.conf \
+  test_mesh_drop.conf
+
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 = \
 EXTRA_DIST = \
   test_testbed_api.conf \
   test_testbed_api_test_timeout.conf \
+  test_testbed_api_template.conf \
+  test_testbed_logger_api.conf \
   test_testbed_api_testbed_run_topologyring.conf \
   test_testbed_api_testbed_run_topologyclique.conf \
   test_testbed_api_testbed_run_topologyline.conf \
-- 
cgit v1.2.3