npub13e…86q3g on Nostr: commit 3dcd3f2733dc2c643297b4fe7f3ea811b7170701 Author: @RandyMcMillan ...

commit 3dcd3f2733dc2c643297b4fe7f3ea811b7170701
Author: @RandyMcMillan <[email protected]>
Date: Tue Jan 23 16:44:25 2024 -0500

make:gnostr:move gnostr.c to src

diff --git a/gnostr.mk b/gnostr.mk
index 45847e098..f2e8bcd56 100644
--- a/gnostr.mk
+++ b/gnostr.mk
@@ -446,16 +446,13 @@ act:act/bin/gnostr-act



-%.o: %.c $(HEADERS)
+%.o: src/%.c $(HEADERS)
@echo "cc $<"
@$(CC) $(CFLAGS) -c $< -o $@

.PHONY:gnostr
gnostr:secp256k1/.libs/libsecp256k1.a libsecp256k1.a $(HEADERS) $(GNOSTR_OBJS) $(ARS)## make gnostr binary
##gnostr initialize
-## git submodule update --init --recursive
-## $(CC) $(CFLAGS) $(GNOSTR_OBJS) $(ARS) -o $@
-# git submodule update --init --recursive
$(CC) $(CFLAGS) $(GNOSTR_OBJS) $(ARS) -o $@
install gnostr /usr/local/bin/

diff --git a/aes.c b/src/aes.c
similarity index 99%
rename from aes.c
rename to src/aes.c
index 546623422..555a78da1 100644
--- a/aes.c
+++ b/src/aes.c
@@ -36,7 +36,7 @@ NOTE: String length must be evenly divisible by 16byte (str_len % 16 == 0)
/* Includes: */
/*****************************************************************************/
#include <string.h> // CBC mode, for memset
-#include "include/aes.h"
+#include "../include/aes.h"

/*****************************************************************************/
/* Defines: */
diff --git a/base64.c b/src/base64.c
similarity index 99%
rename from base64.c
rename to src/base64.c
index e9025314c..2a11378a4 100644
--- a/base64.c
+++ b/src/base64.c
@@ -1,5 +1,5 @@
/* Licensed under BSD-MIT - see LICENSE file for details */
-#include "include/base64.h"
+#include "../include/base64.h"

#include <errno.h>
#include <string.h>
diff --git a/configurator.c b/src/configurator.c
similarity index 100%
rename from configurator.c
rename to src/configurator.c
diff --git a/gnostr.c b/src/gnostr.c
similarity index 98%
rename from gnostr.c
rename to src/gnostr.c
index 9ed5aaa8f..123c62904 100644
--- a/gnostr.c
+++ b/src/gnostr.c
@@ -13,21 +13,21 @@
#include "secp256k1_ecdh.h"
#include "secp256k1_schnorrsig.h"

-#include "include/cursor.h"
-#include "include/hex.h"
-#include "include/base64.h"
-#include "include/aes.h"
-#include "include/sha256.h"
-#include "include/random.h"
-#include "include/proof.h"
-
-#include "include/constants.h"
-#include "include/struct_key.h"
-#include "include/struct_args.h"
-#include "include/struct_nostr_tag.h"
-#include "include/struct_nostr_event.h"
-
-#include "include/openssl_hash.h"
+#include "../include/cursor.h"
+#include "../include/hex.h"
+#include "../include/base64.h"
+#include "../include/aes.h"
+#include "../include/sha256.h"
+#include "../include/random.h"
+#include "../include/proof.h"
+
+#include "../include/constants.h"
+#include "../include/struct_key.h"
+#include "../include/struct_args.h"
+#include "../include/struct_nostr_tag.h"
+#include "../include/struct_nostr_event.h"
+
+#include "../include/openssl_hash.h"

#define VERSION "0.0.16"

diff --git a/sha256.c b/src/sha256.c
similarity index 99%
rename from sha256.c
rename to src/sha256.c
index f71d27ae3..010a3e6b0 100644
--- a/sha256.c
+++ b/src/sha256.c
@@ -6,9 +6,9 @@
* Distributed under the MIT software license, see the accompanying
* file COPYING or http://www.opensource.org/licenses/mit-license.php.
*/
-#include "include/sha256.h"
-#include "include/endian.h"
-#include "include/compiler.h"
+#include "../include/sha256.h"
+#include "../include/endian.h"
+#include "../include/compiler.h"
#include <stdbool.h>
#include <assert.h>
#include <string.h>