Initial move to common config code directory

[tpg/opendispense2.git] / src / server / Makefile

diff --git a/src/server/Makefile b/src/server/Makefile
index fe86e88..dcd6f0d 100644 (file)
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -11,7 +11,7 @@ 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 +22,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 [email protected]
        
+
+obj/%.o: ../common/%.c 
+       @mkdir -p $(dir $@)
+       $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+       @cpp $< -MM -MF [email protected]
+
 -include $(DEPFILES)