Update Makefile
slove merge conflict
@@ -4,9 +4,9 @@ SOURCES = $(wildcard *.c)
OBJECTS_DIR = $(BOAT_BUILD_DIR)/sdk/protocol
OBJECTS = $(patsubst %.c,$(OBJECTS_DIR)/%.o,$(SOURCES))
-.PHONY: all protocol_common protocol_ethereum protocol_platon protocol_platone protocol_fiscobcos protocol_hlfabric protocol_hw_bcs protocol_chainmaker protocol_venachain protocol_quorum
+.PHONY: all protocol_common protocol_ethereum protocol_platon protocol_platone protocol_fiscobcos protocol_hlfabric protocol_hw_bcs protocol_chainmaker protocol_venachain
-all: protocol_common protocol_ethereum protocol_platon protocol_platone protocol_fiscobcos protocol_hlfabric protocol_hw_bcs protocol_chainmaker protocol_venachain protocol_quorum $(OBJECTS_DIR) $(OBJECTS)
+all: protocol_common protocol_ethereum protocol_platon protocol_platone protocol_fiscobcos protocol_hlfabric protocol_hw_bcs protocol_chainmaker protocol_venachain $(OBJECTS_DIR) $(OBJECTS)
protocol_common:
@@ -83,6 +83,3 @@ endif
ifeq ($(BOAT_PROTOCOL_USE_VENACHAIN), 1)
make -C boatvenachain clean
endif
-ifeq ($(BOAT_PROTOCOL_USE_QUORUM), 1)
- make -C boatvenachain clean
-endif
\ No newline at end of file
