aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMITSUNARI Shigeo <herumi@nifty.com>2017-06-04 08:34:43 +0800
committerMITSUNARI Shigeo <herumi@nifty.com>2017-06-04 08:34:43 +0800
commitacf1c832c65429be7f07d8bae5ce91978f78e75f (patch)
treebf47fed054a78659281a88fd603c9810550ae1a0 /Makefile
parent5a38c2e8c9a27555229e9cd61455caf1aa3d8907 (diff)
downloaddexon-bls-acf1c832c65429be7f07d8bae5ce91978f78e75f.tar
dexon-bls-acf1c832c65429be7f07d8bae5ce91978f78e75f.tar.gz
dexon-bls-acf1c832c65429be7f07d8bae5ce91978f78e75f.tar.bz2
dexon-bls-acf1c832c65429be7f07d8bae5ce91978f78e75f.tar.lz
dexon-bls-acf1c832c65429be7f07d8bae5ce91978f78e75f.tar.xz
dexon-bls-acf1c832c65429be7f07d8bae5ce91978f78e75f.tar.zst
dexon-bls-acf1c832c65429be7f07d8bae5ce91978f78e75f.zip
use MBN_.. instead of BLS_
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 14 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 6aa5927..837c335 100644
--- a/Makefile
+++ b/Makefile
@@ -11,17 +11,18 @@ SAMPLE_SRC=bls_smpl.cpp bls_tool.cpp
CFLAGS+=-I../mcl/include
UNIT?=6
ifeq ($(UNIT),4)
- CFLAGS+=-DBLS_FP_UNIT_SIZE=4
+ CFLAGS+=-DMBN_FP_UNIT_SIZE=4
GO_TAG=bn256
endif
ifeq ($(UNIT),6)
- CFLAGS+=-DBLS_FP_UNIT_SIZE=6
+ CFLAGS+=-DMBN_FP_UNIT_SIZE=6
GO_TAG=bn384
endif
sample_test: $(EXE_DIR)/bls_smpl.exe
python bls_smpl.py
+SHARE_BASENAME_SUF?=_dy
##################################################################
BLS_LIB=$(LIB_DIR)/libbls.a
@@ -31,6 +32,7 @@ $(BLS_LIB): $(LIB_OBJ)
$(AR) $@ $(LIB_OBJ)
MCL_LIB=../mcl/lib/libmcl.a
+BN384_LIB=../mcl/lib/libmclbn384.a
$(MCL_LIB):
$(MAKE) -C ../mcl
@@ -38,11 +40,16 @@ $(MCL_LIB):
##################################################################
BLS384_LIB=$(LIB_DIR)/libbls384.a
-lib: $(BLS_LIB) $(BLS384_LIB)
+BLS384_SLIB=$(LIB_DIR)/libbls384$(SHARE_BASENAME_SUF).$(LIB_SUF)
+lib: $(BLS_LIB) $(BLS384_SLIB)
$(BLS384_LIB): $(LIB_OBJ) $(OBJ_DIR)/bls_c384.o
$(AR) $@ $(LIB_OBJ) $(OBJ_DIR)/bls_c384.o
+$(BLS384_SLIB): $(BLS384_LIB) $(BN384_LIB)
+# $(PRE)$(CXX) -shared -o $@ -Wl,--whole-archive $(BLS384_LIB) $(BN384_LIB) $(MCL_LIB) -Wl,--no-whole-archive
+ $(PRE)$(CXX) -shared -o $@ -Wl,--whole-archive $(BLS384_LIB) $(BN384_LIB) -Wl,--no-whole-archive
+
VPATH=test sample src
.SUFFIXES: .cpp .d .exe
@@ -51,7 +58,7 @@ $(OBJ_DIR)/%.o: %.cpp
$(PRE)$(CXX) $(CFLAGS) -c $< -o $@ -MMD -MP -MF $(@:.o=.d)
$(OBJ_DIR)/bls_c384.o: bls_c.cpp
- $(PRE)$(CXX) $(CFLAGS) -c $< -o $@ -MMD -MP -MF $(@:.o=.d) -DBLS_FP_UNIT_SIZE=6
+ $(PRE)$(CXX) $(CFLAGS) -c $< -o $@ -MMD -MP -MF $(@:.o=.d) -DMBN_FP_UNIT_SIZE=6
$(EXE_DIR)/%.exe: $(OBJ_DIR)/%.o $(BLS_LIB) $(BLS384_LIB) $(MCL_LIB)
$(PRE)$(CXX) $< -o $@ $(BLS_LIB) $(BLS384_LIB) -lmcl -L../mcl/lib $(LDFLAGS)
@@ -65,13 +72,12 @@ test: $(TEST_EXE)
@sh -ec 'for i in $(TEST_EXE); do $$i|grep "ctest:name"; done' > result.txt
@grep -v "ng=0, exception=0" result.txt; if [ $$? -eq 1 ]; then echo "all unit tests succeed"; else exit 1; fi
-run_go: go/bls/bls.go go/bls/bls_test.go $(BLS_LIB) $(BLS384_LIB)
-# cd go/bls && env PKG_CONFIG_PATH=./ go test -tags $(GO_TAG) .
- cd go/bls && go test -tags $(GO_TAG) .
+run_go: go/bls/bls.go go/bls/bls_test.go $(BLS384_SLIB)
+ cd go/bls && env CGO_CFLAGS="-I../../include -I../../../mcl/include" CGO_LDFLAGS="-L../../lib -L../../../mcl/lib" LD_LIBRARY_PAHT=../../lib go test .
# cd go/bls && go test -tags $(GO_TAG) -v .
clean:
- $(RM) $(BLS_LIB) $(OBJ_DIR)/*.d $(OBJ_DIR)/*.o $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_SRC) $(ASM_OBJ) $(LIB_OBJ) $(LLVM_SRC) $(BLS384_LIB)
+ $(RM) $(BLS_LIB) $(OBJ_DIR)/*.d $(OBJ_DIR)/*.o $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_SRC) $(ASM_OBJ) $(LIB_OBJ) $(LLVM_SRC) $(BLS384_SLIB)
ALL_SRC=$(SRC_SRC) $(TEST_SRC) $(SAMPLE_SRC)
DEPEND_FILE=$(addprefix $(OBJ_DIR)/, $(ALL_SRC:.cpp=.d))