reorg file structure a bit

zhanshen360 · Feb 11, 2016 · effc891 · effc891
1 parent af0d618
commit effc891
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 HEADERS = bloom.h crack.h hash160.h warpwallet.h
 OBJ_MAIN = brainflayer.o hex2blf.o blfchk.o ecmtabgen.o hexln.o
 OBJ_UTIL = hex.o bloom.o mmapf.o hsearchf.o ec_pubkey_fast.o ripemd160_256.o dldummy.o
-OBJ_FMT = warpwallet.o brainwalletio.o brainv2.o
-OBJECTS = $(OBJ_MAIN) $(OBJ_UTIL) $(OBJ_FMT)
+OBJ_ALGO = $(patsubst %.c,%.o,$(wildcard algo/*.c))
+OBJECTS = $(OBJ_MAIN) $(OBJ_UTIL) $(OBJ_ALGO)
 BINARIES = brainflayer hexln hex2blf blfchk ecmtabgen
 LIBS = -lssl -lrt -lcrypto -lz -lgmp
 CFLAGS = -O3 \
@@ -32,9 +32,11 @@ scrypt-jane/scrypt-jane.o: scrypt-jane/scrypt-jane.h scrypt-jane/scrypt-jane.c
 
 brainflayer.o: brainflayer.c secp256k1/include/secp256k1.h
 
-warpwallet.o: warpwallet.c scrypt-jane/scrypt-jane.h
+format/warpwallet.o: format/warpwallet.c scrypt-jane/scrypt-jane.h
 
-brainwalletio.o: brainwalletio.c scrypt-jane/scrypt-jane.h
+format/brainwalletio.o: format/brainwalletio.c scrypt-jane/scrypt-jane.h
+
+format/brainv2.o: format/brainv2.c scrypt-jane/scrypt-jane.h
 
 ec_pubkey_fast.o: ec_pubkey_fast.c secp256k1/include/secp256k1.h
 	$(COMPILE) -Wno-unused-function -c $< -o $@
@@ -54,7 +56,7 @@ hex2blf: hex2blf.o hex.o bloom.o mmapf.o
 ecmtabgen: ecmtabgen.o mmapf.o ec_pubkey_fast.o
 	$(COMPILE) -static $^ $(LIBS) -o $@
 
-brainflayer: brainflayer.o $(OBJ_UTIL) $(OBJ_FMT) \
+brainflayer: brainflayer.o $(OBJ_UTIL) $(OBJ_ALGO) \
              secp256k1/.libs/libsecp256k1.a scrypt-jane/scrypt-jane.o
 	$(COMPILE) -static $^ $(LIBS) -o $@
 

diff --git a/brainv2.c → algo/brainv2.c b/brainv2.c → algo/brainv2.c
@@ -15,9 +15,9 @@
 // crypto.h used for the version
 #include <openssl/crypto.h>
 
-#include "scrypt-jane/scrypt-jane.h"
+#include "../scrypt-jane/scrypt-jane.h"
 
-#include "hex.h"
+#include "../hex.h"
 
 #include "brainv2.h"
 

diff --git a/brainv2.h → algo/brainv2.h b/brainv2.h → algo/brainv2.h
diff --git a/brainwalletio.c → algo/brainwalletio.c b/brainwalletio.c → algo/brainwalletio.c
@@ -15,9 +15,9 @@
 // crypto.h used for the version
 #include <openssl/crypto.h>
 
-#include "scrypt-jane/scrypt-jane.h"
+#include "../scrypt-jane/scrypt-jane.h"
 
-#include "hex.h"
+#include "../hex.h"
 
 #define _SCRYPT_N (1<<18)
 #define _SCRYPT_r 8

diff --git a/brainwalletio.h → algo/brainwalletio.h b/brainwalletio.h → algo/brainwalletio.h
diff --git a/sha3/keccak.c → algo/keccak.c b/sha3/keccak.c → algo/keccak.c
diff --git a/sha3/keccak.h → algo/keccak.h b/sha3/keccak.h → algo/keccak.h
diff --git a/sha3/sha3.c → algo/sha3.c b/sha3/sha3.c → algo/sha3.c
diff --git a/sha3/sha3.h → algo/sha3.h b/sha3/sha3.h → algo/sha3.h
diff --git a/warpwallet.c → algo/warpwallet.c b/warpwallet.c → algo/warpwallet.c
@@ -15,7 +15,7 @@
 // crypto.h used for the version
 #include <openssl/crypto.h>
 
-#include "scrypt-jane/scrypt-jane.h"
+#include "../scrypt-jane/scrypt-jane.h"
 
 #define _PBKDF2_i (1<<16)
 #define _SCRYPT_N (1<<18)

diff --git a/warpwallet.h → algo/warpwallet.h b/warpwallet.h → algo/warpwallet.h
diff --git a/brainflayer.c b/brainflayer.c
@@ -27,9 +27,10 @@
 #include "hash160.h"
 #include "hsearchf.h"
 
-#include "brainv2.h"
-#include "warpwallet.h"
-#include "brainwalletio.h"
+#include "algo/brainv2.h"
+#include "algo/warpwallet.h"
+#include "algo/brainwalletio.h"
+#include "algo/sha3.h"
 
 static int brainflayer_is_init = 0;