fix RPS service: Provide closure for view insertion

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

diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 57edc27f0def329a96324e595ff8a2f761426600..cbffc3283dad47e8ffefb1b523d826840eba52be 100644 (file)
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 SUBDIRS = .
 
 plugindir = $(libdir)/gnunet
@@ -87,6 +88,12 @@ if BUILD_GST_HELPERS
 AUDIO_HELPER_RECD=gnunet-helper-audio-record
 AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
 AUDIO_TESTS=$(check_PROGRAMS)
+else
+if BUILD_EXPERIMENTAL_HELPERS
+AUDIO_HELPER_RECD=gnunet-helper-audio-record
+AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
+AUDIO_TESTS=$(check_PROGRAMS)
+endif
 endif
 endif
 
@@ -94,8 +101,10 @@ libexec_PROGRAMS += \
   $(AUDIO_HELPER_RECD) \
   $(AUDIO_HELPER_PLAY)
 
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
+if ENABLE_TEST_RUN
 TESTS = $(AUDIO_TESTS)
+endif
 
 if BUILD_PULSE_HELPERS
 gnunet_helper_audio_record_SOURCES = \
@@ -129,7 +138,7 @@ gnunet_helper_audio_record_CFLAGS = \
  $(GST_CFLAGS)
 
 gnunet_helper_audio_playback_SOURCES = \
-  gnunet-helper-audio-playback-gst.c
+    gnunet-helper-audio-playback-gst.c
 gnunet_helper_audio_playback_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GST_LIBS) \
@@ -137,7 +146,31 @@ gnunet_helper_audio_playback_LDADD = \
 gnunet_helper_audio_playback_LDFLAGS = \
   $(WINFLAGS) $(GST_LDFLAGS)
 gnunet_helper_audio_playback_CFLAGS = \
- $(GST_CFLAGS)
+ $(GST_CFLAGS) -DIS_SPEAKER
+else
+if BUILD_EXPERIMENTAL_HELPERS
+gnunet_helper_audio_record_SOURCES = \
+  gnunet_gst_test.c gnunet_gst.c
+gnunet_helper_audio_record_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GST_LIBS) \
+  $(INTLLIBS)
+gnunet_helper_audio_record_LDFLAGS = \
+  $(WINFLAGS) $(GST_LDFLAGS)
+gnunet_helper_audio_record_CFLAGS = \
+ $(GST_CFLAGS) -DIS_MIC
+
+gnunet_helper_audio_playback_SOURCES = \
+    gnunet_gst_test.c gnunet_gst.c
+gnunet_helper_audio_playback_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GST_LIBS) \
+  $(INTLLIBS)
+gnunet_helper_audio_playback_LDFLAGS = \
+  $(WINFLAGS) $(GST_LDFLAGS)
+gnunet_helper_audio_playback_CFLAGS = \
+ $(GST_CFLAGS) -DIS_SPEAKER
+endif
 endif
 endif