X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2FMakefile;h=dcd6f0d10d70d05994e21756eb233c5f093fa445;hb=6d657891a5410b7d93cc90f376a3ef27b72b20f6;hp=300145dd11101e1657b3206ffb8133ba72b6bfe3;hpb=da639e3f13ee62627f4e7b29eccfcac70aad681d;p=tpg%2Fopendispense2.git

diff --git a/src/server/Makefile b/src/server/Makefile
index 300145d..dcd6f0d 100644
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -8,9 +8,10 @@ OBJ += dispense.o itemdb.o
 OBJ += handler_coke.o handler_snack.o handler_door.o
 BIN := ../../dispsrv
 
-DEPFILES := $(OBJ:%.o=%.d)
+OBJ := $(OBJ:%=obj/%)
+DEPFILES := $(OBJ:%=%.d)
 
-LINKFLAGS := -g ../../cokebank.so -lutil -lident -lmodbus -Wl,-rpath,. -Wl,-rpath,$(INSTALLDIR)
+LINKFLAGS := -g ../../cokebank.so -lutil -lident -lmodbus -lsqlite3 -lpthread -Wl,-rpath,. -Wl,-rpath,$(INSTALLDIR)
 CPPFLAGS := 
 CFLAGS := -Wall -Wextra -Werror -g -std=gnu99
 
@@ -19,14 +20,25 @@ CFLAGS := -Wall -Wextra -Werror -g -std=gnu99
 all: $(BIN)
 
 clean:
-	$(RM) $(BIN) $(OBJ)
+	$(RM) $(BIN) $(OBJ) $(DEPFILES)
+
+install: $(BIN)
+	mkdir -p $(INSTALLDIR)
+	cp $(BIN) $(INSTALLDIR)
 
 $(BIN): $(OBJ)
 	$(CC) -o $(BIN) $(OBJ) $(LINKFLAGS)
 
-%.o: %.c
+obj/%.o: %.c 
+	@mkdir -p $(dir $@)
 	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
-	@cpp $< -MM -MF $*.d
+	@cpp $< -MM -MF $@.d
 	
+
+obj/%.o: ../common/%.c 
+	@mkdir -p $(dir $@)
+	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+	@cpp $< -MM -MF $@.d
+
 -include $(DEPFILES)