- fix error messages

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

diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 2bc81653c424656b3d9b24c229072fae452bf883..e122efe9963bd74927ebb4ea940e09e899688239 100644 (file)
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -1,8 +1,10 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
-dist_pkgcfg_DATA = \
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
   arm.conf
 
 if MINGW
@@ -17,19 +19,23 @@ 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:0:0
+  -version-info 1:3: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         
@@ -58,10 +64,12 @@ mockup_service_SOURCES = \
 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
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
@@ -79,13 +87,22 @@ test_exponential_backoff_LDADD = \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
-test_gnunet_service_manager_SOURCES = \
- test_gnunet_service_manager.c
- test_gnunet_service_manager_LDADD = \
+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  
 
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+%.py: %.py.in Makefile
+       $(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