update Makefile

Makefile

@@ -1,30 +1,51 @@
-CC = g++
-LINKER = g++
-CFLAGS = -std=c++14 -Wall -Werror -Wpointer-arith -Wfatal-errors
+CC = gcc
+CXX = g++
+LD = g++
+CXXFLAGS = -std=c++17 -Wall -Werror -Wpointer-arith -Wfatal-errors
+CFLAGS = -Wall -Werror -Wpointer-arith -Wfatal-errors
 DEBUG = -g
 
 prefix=/usr/local
 
-all: shepherd
+OBJECTS = build/memdb.o build/spmemvfs.o build/crypto.o build/Manager.o build/Database.o
 
-shepherd: src/*.cpp src/*.h
-	mkdir -p bin
-	$(CC) $(CFLAGS) src/*.cpp -o bin/shepherd -lsqlite3
+all: build/shepherd build/test
+
+build/shepherd: build/shepherd.o $(OBJECTS)
+	@mkdir -p $(dir $@)
+	@echo "\n->"$@
+	@$(LD) $(CXXFLAGS) $^ -o $@ -lsqlite3 -lsodium -lstdc++fs
+
+build/test: build/testmemvfs.o $(OBJECTS)
+	@mkdir -p $(dir $@)
+	@echo "\n->"$@
+	@$(LD) $(CXXFLAGS) $^ -o $@ -lsqlite3 -lsodium -lstdc++fs
+
+build/%.o: src/%.cpp src/%.h
+	@mkdir -p $(dir $@)
+	@echo -n $@" "
+	@$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+build/%.o: src/%.c src/%.h
+	@mkdir -p $(dir $@)
+	@echo -n $@" "
+	@$(CC) $(CFLAGS) -c -o $@ $<
 
 rsa: rsa.cpp
-	mkdir -p bin
+	@mkdir -p bin
 	$(CC) $(CFLAGS) rsa.cpp -o bin/rsa -lssl -lcrypto
 
-install: bin/shepherd
-	install -m 0755 bin/shepherd $(prefix)/bin
+install: build/shepherd
+	install -m 0755 $@ $(prefix)/bin
 
 .PHONY: test
 test:
 	test/test.sh test/test.db
 
 # remove produced files, invoke as "make clean"
-clean: 
-	rm -f bin/*
+clean:
+	@echo clean build*
+	@rm -f build/*
 
 #%.o : %.cpp
 #	$(CC) $(CFLAGS) -c $^ -o $@