REST/NAMESTORE: rework API

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

diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index c936a222429f696f8e8ce9127c839d112f85e42c..b1706a4793a8ec6ed287ddc9bef51853cdb873e4 100644 (file)
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -1,4 +1,5 @@
-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/
 
@@ -8,7 +9,7 @@ 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
@@ -19,44 +20,41 @@ 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:2:0
+  -version-info 2:0:0
 
 
 bin_PROGRAMS = \
- gnunet-arm 
+ gnunet-arm
+
+noinst_PROGRAMS = \
+ mockup-service
 
 libexec_PROGRAMS = \
- gnunet-service-arm \
- mockup-service 
+ 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 = \
@@ -64,34 +62,38 @@ check_PROGRAMS = \
  test_exponential_backoff \
  test_gnunet_service_arm
 
+if HAVE_PYTHON
 check_SCRIPTS = \
  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 = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetarm.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
-%.py: %.py.in Makefile
+SUFFIXES = .py.in .py
+.py.in.py:
        $(do_subst) < $(srcdir)/$< > $@
        chmod +x $@
 
@@ -101,5 +103,4 @@ test_gnunet_arm.py: test_gnunet_arm.py.in Makefile
 
 EXTRA_DIST = \
   test_arm_api_data.conf \
-  test_gnunet_arm.py.in \
-  do_start_process.c
+  test_gnunet_arm.py.in