X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2FMakefile.am;h=1f8a84a676623671143f1ad32a6750cdb8430d9b;hb=f181f6eaf8cdb1fdb47dc98cf171ad1be842b441;hp=319d6711c713f8124510257a5034a86f04b70ede;hpb=85031a991c852462ca5af9cad45b398694267e9e;p=oweals%2Fgnunet.git

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 319d6711c..1f8a84a67 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -1,5 +1,10 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  ats.conf
+
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
 endif
@@ -8,6 +13,12 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
+if HAVE_LIBGLPK
+  GN_LIBGLPK = -lglpk
+  GN_MLP_SRC = gnunet-service-ats_addresses_mlp.c gnunet-service-ats_addresses_mlp.h
+  GN_MLP_TEST = test_ats_mlp
+endif
+
 lib_LTLIBRARIES = libgnunetats.la
 
 libgnunetats_la_SOURCES = \
@@ -17,38 +28,74 @@ libgnunetats_la_SOURCES = \
 libgnunetats_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la
 
+libgnunetats_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+  -version-info 1:0:1
 
-#bin_PROGRAMS = \
-# gnunet-service-ats
 
-#gnunet_service_ats_SOURCES = \
-# gnunet-service-ats.c         
-#gnunet_service_ats_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(GN_LIBINTL)
+bin_PROGRAMS = \
+ gnunet-service-ats
+
+gnunet_service_ats_SOURCES = \
+ gnunet-service-ats.c gnunet-service-ats.h\
+ gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
+ $(GN_MLP_SRC) \
+ gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
+ gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
+ gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
+gnunet_service_ats_LDADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBGLPK) \
+  $(GN_LIBINTL)
 
 
 check_PROGRAMS = \
- test_ats_api 
-# test_ats_api_update_address
+ test_ats_api_scheduling \
+ $(GN_MLP_TEST)
+# test_ats_api_scheduling_get_type
+# test_ats_api_bandwidth_consumption
 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
-test_ats_api_SOURCES = \
- test_ats_api.c
-test_ats_api_LDADD = \
+if HAVE_LIBGLPK
+test_ats_mlp_SOURCES = \
+ $(GN_MLP_SRC) \
+ test_ats_mlp.c
+test_ats_mlp_LDADD = \
+  $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/ats/libgnunetats.la  
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
+endif
 
-test_ats_api_update_address_SOURCES = \
- test_ats_api_update_address.c
-test_ats_api_update_address_LDADD = \
+test_ats_api_scheduling_SOURCES = \
+ test_ats_api_scheduling.c
+test_ats_api_scheduling_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/ats/libgnunetats.la  
 
+#test_ats_api_scheduling_get_type_SOURCES = \
+# test_ats_api_scheduling_get_type.c
+#test_ats_api_scheduling_get_type_LDADD = \
+#  $(top_builddir)/src/util/libgnunetutil.la \
+#  $(top_builddir)/src/ats/libgnunetats.la  
+
+#test_ats_api_bandwidth_consumption_SOURCES = \
+# test_ats_api_bandwidth_consumption.c
+#test_ats_api_bandwidth_consumption_LDADD = \
+#  $(top_builddir)/src/util/libgnunetutil.la \
+#  $(top_builddir)/src/ats/libgnunetats.la  
+
+#test_ats_api_update_address_SOURCES = \
+# test_ats_api_update_address.c
+#test_ats_api_update_address_LDADD = \
+#  $(top_builddir)/src/util/libgnunetutil.la \
+#  $(top_builddir)/src/ats/libgnunetats.la  
+
 
 EXTRA_DIST = \
+  ats.h \
   test_ats_api.conf