fix: merge conflict in makefile.

Signed-off-by: divy9881 <[email protected]>

Author: divy9881

makefile

@@ -1,21 +1,15 @@
 #Define C/C++ compiler variables
 CXX := g++
-<<<<<<< HEAD
-=======
 AR := ar
->>>>>>> upstream/master
 
 #Define compiler flags
 OBJ_FLAG := -c
 FILE_FLAG :=  -o
-<<<<<<< HEAD
-=======
 STD_FLAG := -std=c++11
 
 #Define archive flags
 AR_FLAG := crv
 AR_NAME := casbin.a
->>>>>>> upstream/master
 
 #Define directory variables
 SRC_DIR := casbin
@@ -28,23 +22,13 @@ OBJ_EXT := o
 LIB_EXT := a
 INC_EXT := h
 
-<<<<<<< HEAD
-=======
 #Define make directory command variable
 MKDIR_P := mkdir -p
 
->>>>>>> upstream/master
 #Get source cpp files
 SRC_FILES := $(shell find $(SRC_DIR) -type f -name *.$(SRC_EXT))
 INC_DIRS := $(shell find $(SRC_DIR) -type d)
 INC_FLAG_DIRS := $(addprefix -I /, $(INC_DIRS))
-<<<<<<< HEAD
-
-all:
-	$(foreach SRC_FILE, $(SRC_FILES),\
-		$(CXX) $(OBJ_FLAG) $(FILE_FLAG) $(SRC_FILE:$(SRC_DIR)/%.$(SRC_EXT)=$(OBJ_DIR)/%.$(OBJ_EXT)) $(SRC_FILE);\
-	)
-=======
 OBJ_DIRS := $(addprefix $(OBJ_DIR)/, $(INC_DIRS))
 
 object:
@@ -65,4 +49,3 @@ library:
 
 clean:
 	rm -r $(OBJ_DIR)
->>>>>>> upstream/master