Initial move to common config code directory

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

diff --git a/src/server/Makefile b/src/server/Makefile
index 300145d..dcd6f0d 100644 (file)
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -8,9 +8,10 @@ OBJ += dispense.o itemdb.o
 OBJ += handler_coke.o handler_snack.o handler_door.o
 BIN := ../../dispsrv
 
-DEPFILES := $(OBJ:%.o=%.d)
+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
 
@@ -19,14 +20,25 @@ CFLAGS := -Wall -Wextra -Werror -g -std=gnu99
 all: $(BIN)
 
 clean:
-       $(RM) $(BIN) $(OBJ)
+       $(RM) $(BIN) $(OBJ) $(DEPFILES)
+
+install: $(BIN)
+       mkdir -p $(INSTALLDIR)
+       cp $(BIN) $(INSTALLDIR)
 
 $(BIN): $(OBJ)
        $(CC) -o $(BIN) $(OBJ) $(LINKFLAGS)
 
-%.o: %.c
+obj/%.o: %.c 
+       @mkdir -p $(dir $@)
        $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
-       @cpp $< -MM -MF $*.d
+       @cpp $< -MM -MF $@.d
        
+
+obj/%.o: ../common/%.c 
+       @mkdir -p $(dir $@)
+       $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+       @cpp $< -MM -MF [email protected]
+
 -include $(DEPFILES)