-fixing

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

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index f547f9ec8ac2543c25bd0b28791dd115ea41116c..8abd9e09c7cd0b106c9ff82875dda7fcaadf13d1 100644 (file)
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -2,6 +2,8 @@ INCLUDES = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
+libexecdir= $(pkglibdir)/libexec/
+
 pkgcfg_DATA = \
   ats.conf
 
@@ -33,12 +35,11 @@ libgnunetats_la_LIBADD = \
 
 libgnunetats_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
-  -version-info 2:0:2
+  -version-info 3:0:3
 
 
-bin_PROGRAMS = \
- gnunet-service-ats \
- gnunet-ats 
+libexec_PROGRAMS = \
+ gnunet-service-ats
 
 gnunet_service_ats_SOURCES = \
  gnunet-service-ats.c gnunet-service-ats.h\
@@ -52,19 +53,14 @@ gnunet_service_ats_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBGLPK) \
   $(GN_LIBINTL)
-  
-gnunet_ats_SOURCES = \
- gnunet-ats.c gnunet-service-ats.h
-gnunet_ats_LDADD = \ 
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(GN_LIBINTL)  
-
+gnunet_service_ats_DEPENDENCIES = \
+  libgnunetats.la
 
 check_PROGRAMS = \
  test_ats_api_scheduling_add_address \
  test_ats_api_scheduling \
  test_ats_api_scheduling_destroy_address \
+ test_ats_api_scheduling_destroy_session \
  test_ats_api_reset_backoff \
  $(GN_MLP_TEST) \
  $(GN_MLP_TEST_AVG) \
@@ -106,24 +102,35 @@ test_ats_api_scheduling_SOURCES = \
  test_ats_api_scheduling.c
 test_ats_api_scheduling_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la  
 
 test_ats_api_reset_backoff_SOURCES = \
  test_ats_api_reset_backoff.c
 test_ats_api_reset_backoff_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la  
 
 test_ats_api_scheduling_add_address_SOURCES = \
  test_ats_api_scheduling_add_address.c
 test_ats_api_scheduling_add_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la  
 
 test_ats_api_scheduling_destroy_address_SOURCES = \
  test_ats_api_scheduling_destroy_address.c
 test_ats_api_scheduling_destroy_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/ats/libgnunetats.la
+
+test_ats_api_scheduling_destroy_session_SOURCES = \
+ test_ats_api_scheduling_destroy_session.c
+test_ats_api_scheduling_destroy_session_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la
 
 #test_ats_api_scheduling_get_type_SOURCES = \
@@ -136,6 +143,7 @@ test_ats_api_scheduling_destroy_address_LDADD = \
 # test_ats_api_bandwidth_consumption.c
 #test_ats_api_bandwidth_consumption_LDADD = \
 #  $(top_builddir)/src/util/libgnunetutil.la \
+#  $(top_builddir)/src/testing/libgnunettesting.la \
 #  $(top_builddir)/src/ats/libgnunetats.la  
 
 #test_ats_api_update_address_SOURCES = \