X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2FMakefile;h=5034bf93b550a3ea5ed8921a7a4a5ec226d25535;hb=1fab0f284eb9f04b5a7b9e9c59baa306ae47f06b;hp=85678a86d7b252dea55db0fe1d0b6d59e66d155d;hpb=dce0ef0f3c15f9e38e57d4a14c904c339affac4e;p=tpg%2Fopendispense2.git

diff --git a/src/server/Makefile b/src/server/Makefile
index 85678a8..5034bf9 100644
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -1,22 +1,45 @@
 # OpenDispense 2
 #
 
-OBJ := main.o server.o logging.o
+INSTALLDIR := /usr/local/opendispense2
+
+OBJ := main.o server.o logging.o 
 OBJ += dispense.o itemdb.o
 OBJ += handler_coke.o handler_snack.o handler_door.o
+OBJ += config.o doregex.o
 BIN := ../../dispsrv
 
-LINKFLAGS := -g ../../cokebank.so
+OBJ := $(OBJ:%=obj/%)
+DEPFILES := $(OBJ:%=%.d)
+
+LINKFLAGS := -g ../../cokebank.so -lutil -lident -lmodbus -lsqlite3 -lpthread -Wl,-rpath,. -Wl,-rpath,$(INSTALLDIR)
 CPPFLAGS := 
-CFLAGS := -Wall -g
+CFLAGS := -Wall -Wextra -Werror -g -std=gnu99
 
 .PHONY: all clean
 
 all: $(BIN)
 
 clean:
-	$(RM) $(BIN) $(OBJ)
+	$(RM) $(BIN) $(OBJ) $(DEPFILES)
+
+install: $(BIN)
+	mkdir -p $(INSTALLDIR)
+	cp $(BIN) $(INSTALLDIR)
 
 $(BIN): $(OBJ)
-	$(CC) -o $(BIN) $(LINKFLAGS) $(OBJ)
+	$(CC) -o $(BIN) $(OBJ) $(LINKFLAGS)
+
+obj/%.o: %.c 
+	@mkdir -p $(dir $@)
+	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+	@cpp $< -MM -MF $@.d
+	
+
+obj/%.o: ../common/%.c 
+	@mkdir -p $(dir $@)
+	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+	@cpp $< -MM -MF $@.d
+
+-include $(DEPFILES)