From 1774d35da2d26627a6c60a6676345a4b1431e1fb Mon Sep 17 00:00:00 2001
From: buffet <niclas@countingsort.com>
Date: Thu, 18 Oct 2018 23:10:06 +0200
Subject: [PATCH] Simplified Makefile

---
 Makefile  | 46 ++++++++++++----------------------------------
 config.mk |  1 -
 2 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile
index 0c0f6ed..0f2ecda 100644
--- a/Makefile
+++ b/Makefile
@@ -15,51 +15,29 @@ OBJ     = $(KWOBJ) $(SEOBJ)
 DEPS    = $(OBJ:.o=.d)
 TARGETS = $(KWTARGET) $(SETARGET)
 
-ifeq ($(VERBOSE), 1)
-	HIDE =
-else
-	HIDE = @
-endif
+.PHONY: all nodoc doc install uninstall clean
 
-.PHONY: all all-nodoc doc install uninstall clean
-
-all: all-nodoc doc
-
-all-nodoc: $(TARGETS)
+all: $(TARGETS)
 
 $(KWTARGET): $(KWOBJ)
-	@echo "  [LD]  $@..."
-	$(HIDE) $(LD) -o "$@" $^ $(LDFLAGS)
+	$(LD) -o $@ $(LDFLAGS) $^
 
 $(SETARGET): $(SEOBJ)
-	@echo "  [LD]  $@..."
-	$(HIDE) $(LD) -o "$@" $^ $(LDFLAGS)
-
-.c.o:
-	@echo "  [CC]  $@..."
-	$(HIDE) $(CC) -o "$@" "$<" -c $(CFLAGS) $(CPPFLAGS)
-
-doc:
+	$(LD) -o $@ $(LDFLAGS) $^
 
 install: all misc/kiwmi.desktop
-	install -Dm755 "$(KWTARGET)" "$(DESTDIR)$(BINPREFIX)/$(KWTARGET)"
-	install -Dm755 "$(SETARGET)" "$(DESTDIR)$(BINPREFIX)/$(SETARGET)"
+	install -Dm755 $(KWTARGET) "$(DESTDIR)$(BINPREFIX)/$(KWTARGET)"
+	install -Dm755 $(SETARGET) "$(DESTDIR)$(BINPREFIX)/$(SETARGET)"
 	install -Dm644 misc/kiwmi.desktop "$(DESTDIR)$(XSESSIONS)/kiwmi.desktop"
 
 uninstall:
-	@echo "  [RM]  $(KWTARGET)..."
-	$(HIDE) $(RM) "$(DESTDIR)$(BINPREFIX)/$(KWTARGET)"
-	@echo "  [RM]  $(SETARGET)..."
-	$(HIDE) $(RM) "$(DESTDIR)$(BINPREFIX)/$(SETARGET)"
-	@echo "  [RM]  kiwmi.desktop..."
-	$(HIDE) $(RM) "$(DESTDIR)$(XSESSIONS)/kiwmi.desktop"
+	$(RM) "$(DESTDIR)$(BINPREFIX)/$(KWTARGET)"
+	$(RM) "$(DESTDIR)$(BINPREFIX)/$(SETARGET)"
+	$(RM) "$(DESTDIR)$(XSESSIONS)/kiwmi.desktop"
 
 clean:
-	@echo "  [RM]  $(DEPS)..."
-	$(HIDE) $(RM) $(DEPS)
-	@echo "  [RM]  $(OBJ)..."
-	$(HIDE) $(RM) $(OBJ)
-	@echo "  [RM]  $(TARGETS)..."
-	$(HIDE) $(RM) $(TARGETS)
+	$(RM) $(DEPS)
+	$(RM) $(OBJ)
+	$(RM) $(TARGETS)
 
 -include $(DEPS)
diff --git a/config.mk b/config.mk
index 9e14994..824e67d 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,4 @@
 VERSION = NaV
-VERBOSE = 0
 
 PREFIX    = /usr/local
 BINPREFIX = $(PREFIX)/bin