[gnunet] 06/06: BUILD: Move conversation to contrib/service

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit b56e4e05ad919c7191260fcf1d78b1f8d739871a
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 11:36:32 2023 +0200

    BUILD: Move conversation to contrib/service
---
 configure.ac                                       |  4 ++--
 po/POTFILES.in                                     | 28 +++++++++++-----------
 src/Makefile.am                                    |  8 -------
 src/contrib/service/Makefile.am                    |  9 +++++++
 src/{ => contrib/service}/conversation/.gitignore  |  0
 src/{ => contrib/service}/conversation/Makefile.am |  0
 .../service}/conversation/build_gst_test.sh        |  0
 .../service}/conversation/conversation.conf.in     |  0
 .../service}/conversation/conversation.h           |  0
 .../service}/conversation/conversation_api.c       |  0
 .../service}/conversation/conversation_api_call.c  |  0
 .../service}/conversation/displaydot.sh            |  0
 .../conversation/gnunet-conversation-test.c        |  0
 .../service}/conversation/gnunet-conversation.c    |  0
 .../gnunet-helper-audio-playback-gst.c             |  0
 .../conversation/gnunet-helper-audio-playback.c    |  0
 .../conversation/gnunet-helper-audio-record-gst.c  |  0
 .../conversation/gnunet-helper-audio-record.c      |  0
 .../conversation/gnunet-service-conversation.c     |  0
 .../service}/conversation/gnunet_gst.c             |  0
 .../service}/conversation/gnunet_gst.h             |  0
 .../service}/conversation/gnunet_gst_def.h         |  0
 .../service}/conversation/gnunet_gst_test.c        |  0
 .../service}/conversation/mediahelper.conf         |  0
 src/{ => contrib/service}/conversation/meson.build |  0
 .../service}/conversation/microphone.c             |  0
 .../conversation/plugin_gnsrecord_conversation.c   |  0
 src/{ => contrib/service}/conversation/speaker.c   |  0
 src/{ => contrib/service}/conversation/test.sh     |  0
 .../service}/conversation/test_conversation.conf   |  0
 .../service}/conversation/test_conversation_api.c  |  0
 .../conversation/test_conversation_api_reject.c    |  0
 .../conversation/test_conversation_api_twocalls.c  |  0
 33 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index f19393f98..36580913c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1324,6 +1324,8 @@ src/contrib/service/abd/abd.conf
 src/contrib/service/auction/Makefile
 src/contrib/service/consensus/Makefile
 src/contrib/service/consensus/consensus.conf
+src/contrib/service/conversation/Makefile
+src/contrib/service/conversation/conversation.conf
 src/contrib/service/scalarproduct/Makefile
 src/contrib/service/scalarproduct/scalarproduct.conf
 src/contrib/service/secretsharing/Makefile
@@ -1334,8 +1336,6 @@ src/contrib/service/rps/Makefile
 src/contrib/service/rps/rps.conf
 src/contrib/service/template/Makefile
 src/contrib/cli/template/Makefile
-src/conversation/Makefile
-src/conversation/conversation.conf
 src/exit/Makefile
 src/fs/Makefile
 src/fs/fs.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3f6cdd3ce..c1e58aa2c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -45,6 +45,20 @@ src/contrib/service/auction/gnunet-service-auction.c
 src/contrib/service/consensus/consensus_api.c
 src/contrib/service/consensus/gnunet-service-consensus.c
 src/contrib/service/consensus/plugin_block_consensus.c
+src/contrib/service/conversation/conversation_api.c
+src/contrib/service/conversation/conversation_api_call.c
+src/contrib/service/conversation/gnunet-conversation-test.c
+src/contrib/service/conversation/gnunet-conversation.c
+src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c
+src/contrib/service/conversation/gnunet-helper-audio-playback.c
+src/contrib/service/conversation/gnunet-helper-audio-record-gst.c
+src/contrib/service/conversation/gnunet-helper-audio-record.c
+src/contrib/service/conversation/gnunet-service-conversation.c
+src/contrib/service/conversation/gnunet_gst.c
+src/contrib/service/conversation/gnunet_gst_test.c
+src/contrib/service/conversation/microphone.c
+src/contrib/service/conversation/plugin_gnsrecord_conversation.c
+src/contrib/service/conversation/speaker.c
 src/contrib/service/rps/gnunet-rps-profiler.c
 src/contrib/service/rps/gnunet-rps.c
 src/contrib/service/rps/gnunet-service-rps.c
@@ -77,20 +91,6 @@ src/contrib/service/set/ibf_sim.c
 src/contrib/service/set/plugin_block_set_test.c
 src/contrib/service/set/set_api.c
 src/contrib/service/template/gnunet-service-template.c
-src/conversation/conversation_api.c
-src/conversation/conversation_api_call.c
-src/conversation/gnunet-conversation-test.c
-src/conversation/gnunet-conversation.c
-src/conversation/gnunet-helper-audio-playback-gst.c
-src/conversation/gnunet-helper-audio-playback.c
-src/conversation/gnunet-helper-audio-record-gst.c
-src/conversation/gnunet-helper-audio-record.c
-src/conversation/gnunet-service-conversation.c
-src/conversation/gnunet_gst.c
-src/conversation/gnunet_gst_test.c
-src/conversation/microphone.c
-src/conversation/plugin_gnsrecord_conversation.c
-src/conversation/speaker.c
 src/exit/gnunet-daemon-exit.c
 src/exit/gnunet-helper-exit.c
 src/fs/fs_api.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 3cc409f31..0d1607b6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,6 @@
 # This Makefile.am is in the public domain
 
 
-if BUILD_PULSE_HELPERS
-CONVERSATION_DIR = conversation
-else
-if BUILD_GST_HELPERS
-CONVERSATION_DIR = conversation
-endif
-endif
 
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
@@ -17,7 +10,6 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  $(CONVERSATION_DIR) \
   fs \
   exit \
   pt \
diff --git a/src/contrib/service/Makefile.am b/src/contrib/service/Makefile.am
index 4092cc46c..2d365106b 100644
--- a/src/contrib/service/Makefile.am
+++ b/src/contrib/service/Makefile.am
@@ -5,10 +5,19 @@ if HAVE_EXPERIMENTAL
   auction
 endif
 
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
+endif
+endif
+
 SUBDIRS = \
        template \
        set \
        consensus \
        secretsharing \
        scalarproduct \
+  $(CONVERSATION_DIR) \
        $(EXP_DIR)
diff --git a/src/conversation/.gitignore 
b/src/contrib/service/conversation/.gitignore
similarity index 100%
rename from src/conversation/.gitignore
rename to src/contrib/service/conversation/.gitignore
diff --git a/src/conversation/Makefile.am 
b/src/contrib/service/conversation/Makefile.am
similarity index 100%
rename from src/conversation/Makefile.am
rename to src/contrib/service/conversation/Makefile.am
diff --git a/src/conversation/build_gst_test.sh 
b/src/contrib/service/conversation/build_gst_test.sh
similarity index 100%
rename from src/conversation/build_gst_test.sh
rename to src/contrib/service/conversation/build_gst_test.sh
diff --git a/src/conversation/conversation.conf.in 
b/src/contrib/service/conversation/conversation.conf.in
similarity index 100%
rename from src/conversation/conversation.conf.in
rename to src/contrib/service/conversation/conversation.conf.in
diff --git a/src/conversation/conversation.h 
b/src/contrib/service/conversation/conversation.h
similarity index 100%
rename from src/conversation/conversation.h
rename to src/contrib/service/conversation/conversation.h
diff --git a/src/conversation/conversation_api.c 
b/src/contrib/service/conversation/conversation_api.c
similarity index 100%
rename from src/conversation/conversation_api.c
rename to src/contrib/service/conversation/conversation_api.c
diff --git a/src/conversation/conversation_api_call.c 
b/src/contrib/service/conversation/conversation_api_call.c
similarity index 100%
rename from src/conversation/conversation_api_call.c
rename to src/contrib/service/conversation/conversation_api_call.c
diff --git a/src/conversation/displaydot.sh 
b/src/contrib/service/conversation/displaydot.sh
similarity index 100%
rename from src/conversation/displaydot.sh
rename to src/contrib/service/conversation/displaydot.sh
diff --git a/src/conversation/gnunet-conversation-test.c 
b/src/contrib/service/conversation/gnunet-conversation-test.c
similarity index 100%
rename from src/conversation/gnunet-conversation-test.c
rename to src/contrib/service/conversation/gnunet-conversation-test.c
diff --git a/src/conversation/gnunet-conversation.c 
b/src/contrib/service/conversation/gnunet-conversation.c
similarity index 100%
rename from src/conversation/gnunet-conversation.c
rename to src/contrib/service/conversation/gnunet-conversation.c
diff --git a/src/conversation/gnunet-helper-audio-playback-gst.c 
b/src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c
similarity index 100%
rename from src/conversation/gnunet-helper-audio-playback-gst.c
rename to src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c
diff --git a/src/conversation/gnunet-helper-audio-playback.c 
b/src/contrib/service/conversation/gnunet-helper-audio-playback.c
similarity index 100%
rename from src/conversation/gnunet-helper-audio-playback.c
rename to src/contrib/service/conversation/gnunet-helper-audio-playback.c
diff --git a/src/conversation/gnunet-helper-audio-record-gst.c 
b/src/contrib/service/conversation/gnunet-helper-audio-record-gst.c
similarity index 100%
rename from src/conversation/gnunet-helper-audio-record-gst.c
rename to src/contrib/service/conversation/gnunet-helper-audio-record-gst.c
diff --git a/src/conversation/gnunet-helper-audio-record.c 
b/src/contrib/service/conversation/gnunet-helper-audio-record.c
similarity index 100%
rename from src/conversation/gnunet-helper-audio-record.c
rename to src/contrib/service/conversation/gnunet-helper-audio-record.c
diff --git a/src/conversation/gnunet-service-conversation.c 
b/src/contrib/service/conversation/gnunet-service-conversation.c
similarity index 100%
rename from src/conversation/gnunet-service-conversation.c
rename to src/contrib/service/conversation/gnunet-service-conversation.c
diff --git a/src/conversation/gnunet_gst.c 
b/src/contrib/service/conversation/gnunet_gst.c
similarity index 100%
rename from src/conversation/gnunet_gst.c
rename to src/contrib/service/conversation/gnunet_gst.c
diff --git a/src/conversation/gnunet_gst.h 
b/src/contrib/service/conversation/gnunet_gst.h
similarity index 100%
rename from src/conversation/gnunet_gst.h
rename to src/contrib/service/conversation/gnunet_gst.h
diff --git a/src/conversation/gnunet_gst_def.h 
b/src/contrib/service/conversation/gnunet_gst_def.h
similarity index 100%
rename from src/conversation/gnunet_gst_def.h
rename to src/contrib/service/conversation/gnunet_gst_def.h
diff --git a/src/conversation/gnunet_gst_test.c 
b/src/contrib/service/conversation/gnunet_gst_test.c
similarity index 100%
rename from src/conversation/gnunet_gst_test.c
rename to src/contrib/service/conversation/gnunet_gst_test.c
diff --git a/src/conversation/mediahelper.conf 
b/src/contrib/service/conversation/mediahelper.conf
similarity index 100%
rename from src/conversation/mediahelper.conf
rename to src/contrib/service/conversation/mediahelper.conf
diff --git a/src/conversation/meson.build 
b/src/contrib/service/conversation/meson.build
similarity index 100%
rename from src/conversation/meson.build
rename to src/contrib/service/conversation/meson.build
diff --git a/src/conversation/microphone.c 
b/src/contrib/service/conversation/microphone.c
similarity index 100%
rename from src/conversation/microphone.c
rename to src/contrib/service/conversation/microphone.c
diff --git a/src/conversation/plugin_gnsrecord_conversation.c 
b/src/contrib/service/conversation/plugin_gnsrecord_conversation.c
similarity index 100%
rename from src/conversation/plugin_gnsrecord_conversation.c
rename to src/contrib/service/conversation/plugin_gnsrecord_conversation.c
diff --git a/src/conversation/speaker.c 
b/src/contrib/service/conversation/speaker.c
similarity index 100%
rename from src/conversation/speaker.c
rename to src/contrib/service/conversation/speaker.c
diff --git a/src/conversation/test.sh b/src/contrib/service/conversation/test.sh
similarity index 100%
rename from src/conversation/test.sh
rename to src/contrib/service/conversation/test.sh
diff --git a/src/conversation/test_conversation.conf 
b/src/contrib/service/conversation/test_conversation.conf
similarity index 100%
rename from src/conversation/test_conversation.conf
rename to src/contrib/service/conversation/test_conversation.conf
diff --git a/src/conversation/test_conversation_api.c 
b/src/contrib/service/conversation/test_conversation_api.c
similarity index 100%
rename from src/conversation/test_conversation_api.c
rename to src/contrib/service/conversation/test_conversation_api.c
diff --git a/src/conversation/test_conversation_api_reject.c 
b/src/contrib/service/conversation/test_conversation_api_reject.c
similarity index 100%
rename from src/conversation/test_conversation_api_reject.c
rename to src/contrib/service/conversation/test_conversation_api_reject.c
diff --git a/src/conversation/test_conversation_api_twocalls.c 
b/src/contrib/service/conversation/test_conversation_api_twocalls.c
similarity index 100%
rename from src/conversation/test_conversation_api_twocalls.c
rename to src/contrib/service/conversation/test_conversation_api_twocalls.c

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.