X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2FMakefile;h=e5247f24dfe8af66477b7fb33dbdd2ca793f53b4;hb=857e7c75bb043a518ea0e724e635f68702ba33d0;hp=41c23cb756cbb15eb4defc3a76ffe6e430fd1849;hpb=7b8c4e61950317e2f56093328b8c42c2a3c1e2e2;p=tpg%2Fopendispense2.git

diff --git a/src/client/Makefile b/src/client/Makefile
index 41c23cb..e5247f2 100644
--- a/src/client/Makefile
+++ b/src/client/Makefile
@@ -1,5 +1,6 @@
 # OpenDispense 2
 #
+V ?= @
 
 INSTALLDIR := /usr/local/opendispense2
 CFLAGS := -Wall -Werror -g -std=gnu99
@@ -8,6 +9,10 @@ LDFLAGS := -g -lncurses
 
 BIN := ../../dispense
 OBJ := main.o protocol.o menu.o
+OBJ += doregex.o config.o
+
+OBJ := $(patsubst %,.obj/%,$(OBJ))
+
 
 DEPFILES := $(OBJ:%.o=%.d)
 
@@ -23,12 +28,18 @@ install: $(BIN)
 	cp $(BIN) $(INSTALLDIR)
 
 $(BIN): $(OBJ)
-	$(CC) -o $(BIN) $(OBJ) $(LDFLAGS)
-#	chown root $(BIN)
-#	chmod u+s $(BIN)
-
-%.o: %.c
-	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
-	$(CC) -M -MT $@ -o $*.d $< $(CPPFLAGS)
+	@echo "[CC] -o $@"
+	$V$(CC) -o $(BIN) $(OBJ) $(LDFLAGS)
+#	chown root $(BIN) && chmod u+s $(BIN)
+
+.obj/%.o: %.c
+	@echo "[CC] -c $<"
+	@mkdir -p $(dir $@)
+	$V$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) -MMD -MF $@.d
+
+.obj/%.o: ../common/%.c
+	@echo "[CC] -c $<"
+	@mkdir -p $(dir $@)
+	$V$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) -MMD -MF $@.d
 
 -include $(DEPFILES)