Merge pull request #3 from mtearle/master
Add Client Config file to enable local system override of dispense host/port
client.conf
0 → 100644
... | ... | @@ -8,6 +8,7 @@ LDFLAGS := -g -lncurses |
BIN := ../../dispense | ||
OBJ := main.o protocol.o menu.o | ||
OBJ += doregex.o config.o | ||
DEPFILES := $(OBJ:%.o=%.d) | ||
... | ... | @@ -31,4 +32,8 @@ $(BIN): $(OBJ) |
$(CC) -c $< -o [email protected] $(CFLAGS) $(CPPFLAGS) | ||
$(CC) -M -MT [email protected] -o $*.d $< $(CPPFLAGS) | ||
%.o: ../common/%.c | ||
$(CC) -c $< -o [email protected] $(CFLAGS) $(CPPFLAGS) | ||
$(CC) -M -MT [email protected] -o $*.d $< $(CPPFLAGS) | ||
-include $(DEPFILES) |
src/common/config.h
0 → 100644
src/common/doregex.c
0 → 100644
src/common/doregex.h
0 → 100644
... | ... | @@ -3,9 +3,10 @@ |
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/%) | ||
... | ... | @@ -29,10 +30,16 @@ install: $(BIN) |
$(BIN): $(OBJ) | ||
$(CC) -o $(BIN) $(OBJ) $(LINKFLAGS) | ||
obj/%.o: %.c | ||
obj/%.o: %.c | ||
@mkdir -p $(dir [email protected]) | ||
$(CC) -c $< -o [email protected] $(CFLAGS) $(CPPFLAGS) | ||
@cpp $< -MM -MF [email protected].d | ||
obj/%.o: ../common/%.c | ||
@mkdir -p $(dir [email protected]) | ||
$(CC) -c $< -o [email protected] $(CFLAGS) $(CPPFLAGS) | ||
@cpp $< -MM -MF [email protected].d | ||
-include $(DEPFILES) | ||
Please register or sign in to comment