-fixing #2546

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

diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 3f91e9981af92ca9ed24a5f5906b1530a2f8e165..035681ba629c74b0ad15d50d4750c828085e7161 100644 (file)
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -1,5 +1,10 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  arm.conf
+
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
 endif
@@ -18,7 +23,7 @@ libgnunetarm_la_LIBADD = \
   $(GN_LIBINTL) $(XLIB)
 libgnunetarm_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 0:0:0
+  -version-info 1:1:0
 
 
 bin_PROGRAMS = \
@@ -32,13 +37,16 @@ gnunet_arm_LDADD = \
   $(top_builddir)/src/arm/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.h \
- gnunet-service-arm_interceptor.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 = \
@@ -53,9 +61,9 @@ check_PROGRAMS = \
  test_gnunet_service_manager
 
 check_SCRIPTS = \
- test_gnunet_arm.sh
+ test_gnunet_arm.py
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
 endif
 
@@ -77,7 +85,17 @@ test_gnunet_service_manager_SOURCES = \
   $(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 \
+  do_start_process.c