REST/NAMESTORE: rework API

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

diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 25eb7d166e5beac886d11f5afb34ce5b9f028504..b1706a4793a8ec6ed287ddc9bef51853cdb873e4 100644 (file)
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -1,12 +1,15 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
-dist_pkgcfg_DATA = \
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
   arm.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -17,75 +20,87 @@ endif
 lib_LTLIBRARIES = libgnunetarm.la
 
 libgnunetarm_la_SOURCES = \
-  arm_api.c arm.h
+  arm_api.c arm_monitor_api.c arm.h
 libgnunetarm_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetarm_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 1:1:0
+  -version-info 2:0:0
 
 
 bin_PROGRAMS = \
- gnunet-arm \
- gnunet-service-arm \
- mockup-service 
+ gnunet-arm
+
+noinst_PROGRAMS = \
+ mockup-service
+
+libexec_PROGRAMS = \
+ gnunet-service-arm
 
 gnunet_arm_SOURCES = \
- gnunet-arm.c         
+ gnunet-arm.c
 gnunet_arm_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_arm_DEPENDENCIES = \
-  libgnunetarm.la                        
 
 gnunet_service_arm_SOURCES = \
- gnunet-service-arm.c 
+ gnunet-service-arm.c
 gnunet_service_arm_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_arm_DEPENDENCIES = \
-  libgnunetarm.la                        
-
 
 mockup_service_SOURCES = \
   mockup-service.c
  mockup_service_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 
 
 check_PROGRAMS = \
  test_arm_api \
  test_exponential_backoff \
- test_gnunet_service_manager
+ test_gnunet_service_arm
 
+if HAVE_PYTHON
 check_SCRIPTS = \
- test_gnunet_arm.sh
+ test_gnunet_arm.py
+endif
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
 endif
 
 test_arm_api_SOURCES = \
  test_arm_api.c
 test_arm_api_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetarm.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_exponential_backoff_SOURCES = \
  test_exponential_backoff.c
 test_exponential_backoff_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetarm.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+
+test_gnunet_service_arm_SOURCES = \
+ test_gnunet_service_arm.c
+ test_gnunet_service_arm_LDADD = \
+  libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
-test_gnunet_service_manager_SOURCES = \
- test_gnunet_service_manager.c
- test_gnunet_service_manager_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la  
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+SUFFIXES = .py.in .py
+.py.in.py:
+       $(do_subst) < $(srcdir)/$< > $@
+       chmod +x $@
+
+test_gnunet_arm.py: test_gnunet_arm.py.in Makefile
+       $(do_subst) < $(srcdir)/test_gnunet_arm.py.in > test_gnunet_arm.py
+       chmod +x test_gnunet_arm.py
 
 EXTRA_DIST = \
   test_arm_api_data.conf \
-  do_start_process.c \
-  $(check_SCRIPTS) 
+  test_gnunet_arm.py.in