Makefile - Clean up makefiles

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

diff --git a/src/client/Makefile b/src/client/Makefile
index 41c23cb..e5247f2 100644 (file)
--- 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 [email protected]
+
+.obj/%.o: ../common/%.c
+       @echo "[CC] -c $<"
+       @mkdir -p $(dir $@)
+       $V$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) -MMD -MF [email protected]
 
 -include $(DEPFILES)