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

diff --git a/src/server/Makefile b/src/server/Makefile
index fe86e88..5034bf9 100644
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -3,15 +3,16 @@
 
 INSTALLDIR := /usr/local/opendispense2
 
-OBJ := main.o server.o logging.o config.o
+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
 
 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
 
@@ -22,13 +23,23 @@ all: $(BIN)
 clean:
 	$(RM) $(BIN) $(OBJ) $(DEPFILES)
 
+install: $(BIN)
+	mkdir -p $(INSTALLDIR)
+	cp $(BIN) $(INSTALLDIR)
+
 $(BIN): $(OBJ)
 	$(CC) -o $(BIN) $(OBJ) $(LINKFLAGS)
 
-obj/%.o: %.c
+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)