[gnunet] 01/10: BUILD: Move curl to lib

[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 84bbd6f1be6686b3c816ee5bb5c0c786ac193c6c
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 18 13:43:12 2023 +0200

    BUILD: Move curl to lib
---
 configure.ac                         | 2 +-
 po/POTFILES.in                       | 4 ++--
 src/Makefile.am                      | 2 --
 src/lib/Makefile.am                  | 3 ++-
 src/{ => lib}/curl/Makefile.am       | 0
 src/{ => lib}/curl/curl.c            | 0
 src/{ => lib}/curl/curl_reschedule.c | 0
 src/{ => lib}/curl/meson.build       | 0
 8 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index da5b39712..32f758fe0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1232,6 +1232,7 @@ src/arm/Makefile
 src/arm/arm.conf
 src/auction/Makefile
 src/lib/block/Makefile
+src/lib/curl/Makefile
 src/lib/gnsrecord/Makefile
 src/plugin/Makefile
 src/plugin/block/Makefile
@@ -1244,7 +1245,6 @@ src/consensus/Makefile
 src/consensus/consensus.conf
 src/conversation/Makefile
 src/conversation/conversation.conf
-src/curl/Makefile
 src/datacache/Makefile
 src/datastore/Makefile
 src/datastore/datastore.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7ae248c18..5077e8ae4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -67,8 +67,6 @@ src/core/gnunet-service-core.c
 src/core/gnunet-service-core_kx.c
 src/core/gnunet-service-core_sessions.c
 src/core/gnunet-service-core_typemap.c
-src/curl/curl.c
-src/curl/curl_reschedule.c
 src/datacache/datacache.c
 src/datacache/plugin_datacache_heap.c
 src/datacache/plugin_datacache_postgres.c
@@ -178,6 +176,8 @@ src/json/json_mhd.c
 src/json/json_pack.c
 src/lib/block/bg_bf.c
 src/lib/block/block.c
+src/lib/curl/curl.c
+src/lib/curl/curl_reschedule.c
 src/lib/gnsrecord/gnsrecord.c
 src/lib/gnsrecord/gnsrecord_crypto.c
 src/lib/gnsrecord/gnsrecord_misc.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 3746c6b19..049d809ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,6 @@ if HAVE_EXPERIMENTAL
 endif
 
 JSON_DIR = json
-CURL_DIR = curl
 
 if BUILD_PULSE_HELPERS
 CONVERSATION_DIR = conversation
@@ -41,7 +40,6 @@ SUBDIRS = \
   arm \
   $(TESTING) \
   $(JSON_DIR) \
-  $(CURL_DIR) \
   $(REST_DIR) \
   $(SQLITE_DIR) \
   $(POSTGRES_DIR) \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 0b9a75dad..4e37f6234 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -2,4 +2,5 @@ SUBDIRS = \
        util \
        hello \
        block \
-       gnsrecord
+       gnsrecord \
+       curl
diff --git a/src/curl/Makefile.am b/src/lib/curl/Makefile.am
similarity index 100%
rename from src/curl/Makefile.am
rename to src/lib/curl/Makefile.am
diff --git a/src/curl/curl.c b/src/lib/curl/curl.c
similarity index 100%
rename from src/curl/curl.c
rename to src/lib/curl/curl.c
diff --git a/src/curl/curl_reschedule.c b/src/lib/curl/curl_reschedule.c
similarity index 100%
rename from src/curl/curl_reschedule.c
rename to src/lib/curl/curl_reschedule.c
diff --git a/src/curl/meson.build b/src/lib/curl/meson.build
similarity index 100%
rename from src/curl/meson.build
rename to src/lib/curl/meson.build

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