rename bls_if.h to bls.h

1 files changed, 14 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 3ae7afc..6aa5927 100644
--- a/Makefile
+++ b/Makefile
@@ -4,18 +4,18 @@ OBJ_DIR=obj
 EXE_DIR=bin
 CFLAGS += -std=c++11
 
-SRC_SRC=bls.cpp bls_if.cpp
-TEST_SRC=bls_test.cpp bls_if_test.cpp
+SRC_SRC=bls.cpp bls_c.cpp
+TEST_SRC=bls_test.cpp bls_c384_test.cpp
 SAMPLE_SRC=bls_smpl.cpp bls_tool.cpp
 
 CFLAGS+=-I../mcl/include
 UNIT?=6
 ifeq ($(UNIT),4)
-  CFLAGS+=-DBLS_MAX_OP_UNIT_SIZE=4
+  CFLAGS+=-DBLS_FP_UNIT_SIZE=4
   GO_TAG=bn256
 endif
 ifeq ($(UNIT),6)
-  CFLAGS+=-DBLS_MAX_OP_UNIT_SIZE=6
+  CFLAGS+=-DBLS_FP_UNIT_SIZE=6
   GO_TAG=bn384
 endif
 
@@ -37,11 +37,11 @@ $(MCL_LIB):
 
 ##################################################################
 
-BLS_IF_LIB=$(LIB_DIR)/libbls_if.a
-lib: $(BLS_LIB) $(BLS_IF_LIB)
+BLS384_LIB=$(LIB_DIR)/libbls384.a
+lib: $(BLS_LIB) $(BLS384_LIB)
 
-$(BLS_IF_LIB): $(LIB_OBJ) $(OBJ_DIR)/bls_if.o
-	$(AR) $@ $(LIB_OBJ) $(OBJ_DIR)/bls_if.o
+$(BLS384_LIB): $(LIB_OBJ) $(OBJ_DIR)/bls_c384.o
+	$(AR) $@ $(LIB_OBJ) $(OBJ_DIR)/bls_c384.o
 
 VPATH=test sample src
 
@@ -50,11 +50,11 @@ VPATH=test sample src
 $(OBJ_DIR)/%.o: %.cpp
 	$(PRE)$(CXX) $(CFLAGS) -c $< -o $@ -MMD -MP -MF $(@:.o=.d)
 
-$(EXE_DIR)/%.exe: $(OBJ_DIR)/%.o $(BLS_LIB) $(MCL_LIB)
-	$(PRE)$(CXX) $< -o $@ $(BLS_LIB) -lmcl -L../mcl/lib $(LDFLAGS)
+$(OBJ_DIR)/bls_c384.o: bls_c.cpp
+	$(PRE)$(CXX) $(CFLAGS) -c $< -o $@ -MMD -MP -MF $(@:.o=.d) -DBLS_FP_UNIT_SIZE=6
 
-$(EXE_DIR)/bls_if_test.exe: $(OBJ_DIR)/bls_if_test.o $(BLS_LIB) $(MCL_LIB) $(BLS_IF_LIB)
-	$(PRE)$(CXX) $< -o $@ $(BLS_LIB) $(BLS_IF_LIB) -lmcl -L../mcl/lib $(LDFLAGS)
+$(EXE_DIR)/%.exe: $(OBJ_DIR)/%.o $(BLS_LIB) $(BLS384_LIB) $(MCL_LIB)
+	$(PRE)$(CXX) $< -o $@ $(BLS_LIB) $(BLS384_LIB) -lmcl -L../mcl/lib $(LDFLAGS)
 
 SAMPLE_EXE=$(addprefix $(EXE_DIR)/,$(SAMPLE_SRC:.cpp=.exe))
 sample: $(SAMPLE_EXE) $(BLS_LIB)
@@ -65,13 +65,13 @@ 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) $(BLS_IF_LIB)
+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) .
 #	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) $(BLS_IF_LIB)
+	$(RM) $(BLS_LIB) $(OBJ_DIR)/*.d $(OBJ_DIR)/*.o $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_SRC) $(ASM_OBJ) $(LIB_OBJ) $(LLVM_SRC) $(BLS384_LIB)
 
 ALL_SRC=$(SRC_SRC) $(TEST_SRC) $(SAMPLE_SRC)
 DEPEND_FILE=$(addprefix $(OBJ_DIR)/, $(ALL_SRC:.cpp=.d))