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

diff --git a/src/server/Makefile b/src/server/Makefile
index 6acb88c..300145d 100644
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -1,16 +1,18 @@
 # OpenDispense 2
 #
 
-OBJ := main.o server.o logging.o
+INSTALLDIR := /usr/local/opendispense2
+
+OBJ := main.o server.o logging.o config.o
 OBJ += dispense.o itemdb.o
 OBJ += handler_coke.o handler_snack.o handler_door.o
 BIN := ../../dispsrv
 
 DEPFILES := $(OBJ:%.o=%.d)
 
-LINKFLAGS := -g ../../cokebank.so -lutil -lident -Wl,-rpath,. -Wl,-rpath,/usr/local/sbin
+LINKFLAGS := -g ../../cokebank.so -lutil -lident -lmodbus -Wl,-rpath,. -Wl,-rpath,$(INSTALLDIR)
 CPPFLAGS := 
-CFLAGS := -Wall -Wextra -Werror -g
+CFLAGS := -Wall -Wextra -Werror -g -std=gnu99
 
 .PHONY: all clean
 
@@ -20,7 +22,7 @@ clean:
 	$(RM) $(BIN) $(OBJ)
 
 $(BIN): $(OBJ)
-	$(CC) -o $(BIN) $(LINKFLAGS) $(OBJ)
+	$(CC) -o $(BIN) $(OBJ) $(LINKFLAGS)
 
 %.o: %.c
 	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)