Makefile: just show the compiler output

Don't be fancy and just show the actual output so debugging is simpler.
author: Hiltjo Posthuma <hiltjo@codemadness.org> 2018-06-02 17:09:01 +0200
committer: Hiltjo Posthuma <hiltjo@codemadness.org> 2018-06-02 17:09:01 +0200
commit: a314412f4b80af5100901344856a341f8ea4cc7a (patch)
tree: 0631d7885d52c5308cc38e78fcdef1a6512aad15
parent: a9eae39e934d8dab7f1772570efb5f25825bfe01 (diff)
1 files changed, 28 insertions, 38 deletions
diff --git a/Makefile b/Makefile
index daac40b..a03a95c 100644
--- a/Makefile
+++ b/Makefile
@@ -15,60 +15,50 @@ options:
        @echo "CC       = $(CC)"
 .c.o:
-        @echo CC $<
+        $(CC) -c $(CFLAGS) $<
-        @$(CC) -c $(CFLAGS) $<
 config.h:
-        @echo creating $@ from config.def.h
+        cp config.def.h $@
-        @cp config.def.h $@
 $(OBJ): arg.h config.h config.mk drw.h
 dmenu: dmenu.o drw.o util.o
-        @echo CC -o $@
+        $(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
-        @$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
 stest: stest.o
-        @echo CC -o $@
+        $(CC) -o $@ stest.o $(LDFLAGS)
-        @$(CC) -o $@ stest.o $(LDFLAGS)
 clean:
-        @echo cleaning
+        rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
-        @rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
 dist: clean
-        @echo creating dist tarball
+        mkdir -p dmenu-$(VERSION)
-        @mkdir -p dmenu-$(VERSION)
+        cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\
-        @cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1 \
+                drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\
-                drw.h util.h dmenu_path dmenu_run stest.1 $(SRC) \
                dmenu-$(VERSION)
-        @tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
+        tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
-        @gzip dmenu-$(VERSION).tar
+        gzip dmenu-$(VERSION).tar
-        @rm -rf dmenu-$(VERSION)
+        rm -rf dmenu-$(VERSION)
 install: all
-        @echo installing executables to $(DESTDIR)$(PREFIX)/bin
+        mkdir -p $(DESTDIR)$(PREFIX)/bin
-        @mkdir -p $(DESTDIR)$(PREFIX)/bin
+        cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
-        @cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
+        chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
-        @chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
+        chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
-        @chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
+        chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
-        @chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
+        chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
-        @chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
+        mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-        @echo installing manual pages to $(DESTDIR)$(MANPREFIX)/man1
+        sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
-        @mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+        sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
-        @sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
+        chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
-        @sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
+        chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
-        @chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
-        @chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
 uninstall:
-        @echo removing executables from $(DESTDIR)$(PREFIX)/bin
+        rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\
-        @rm -f $(DESTDIR)$(PREFIX)/bin/dmenu
+                $(DESTDIR)$(PREFIX)/bin/dmenu_path\
-        @rm -f $(DESTDIR)$(PREFIX)/bin/dmenu_path
+                $(DESTDIR)$(PREFIX)/bin/dmenu_run\
-        @rm -f $(DESTDIR)$(PREFIX)/bin/dmenu_run
+                $(DESTDIR)$(PREFIX)/bin/stest\
-        @rm -f $(DESTDIR)$(PREFIX)/bin/stest
+                $(DESTDIR)$(MANPREFIX)/man1/dmenu.1\
-        @echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1
+                $(DESTDIR)$(MANPREFIX)/man1/stest.1
-        @rm -f $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
-        @rm -f $(DESTDIR)$(MANPREFIX)/man1/stest.1
 .PHONY: all options clean dist install uninstall
author	Hiltjo Posthuma <hiltjo@codemadness.org>	2018-06-02 17:09:01 +0200
committer	Hiltjo Posthuma <hiltjo@codemadness.org>	2018-06-02 17:09:01 +0200
commit	a314412f4b80af5100901344856a341f8ea4cc7a (patch)
tree	0631d7885d52c5308cc38e78fcdef1a6512aad15
parent	a9eae39e934d8dab7f1772570efb5f25825bfe01 (diff)

diff --git a/Makefile b/Makefile index daac40b..a03a95c 100644 --- a/Makefile +++ b/Makefile
@@ -15,60 +15,50 @@ options:
15	@echo "CC = $(CC)"	15	@echo "CC = $(CC)"
16		16
17	.c.o:	17	.c.o:
18	@echo CC $<	18	$(CC) -c $(CFLAGS) $<
19	@$(CC) -c $(CFLAGS) $<
20		19
21	config.h:	20	config.h:
22	@echo creating $@ from config.def.h	21	cp config.def.h $@
23	@cp config.def.h $@
24		22
25	$(OBJ): arg.h config.h config.mk drw.h	23	$(OBJ): arg.h config.h config.mk drw.h
26		24
27	dmenu: dmenu.o drw.o util.o	25	dmenu: dmenu.o drw.o util.o
28	@echo CC -o $@	26	$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
29	@$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
30		27
31	stest: stest.o	28	stest: stest.o
32	@echo CC -o $@	29	$(CC) -o $@ stest.o $(LDFLAGS)
33	@$(CC) -o $@ stest.o $(LDFLAGS)
34		30
35	clean:	31	clean:
36	@echo cleaning	32	rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
37	@rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
38		33
39	dist: clean	34	dist: clean
40	@echo creating dist tarball	35	mkdir -p dmenu-$(VERSION)
41	@mkdir -p dmenu-$(VERSION)	36	cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\
42	@cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1 \	37	drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\
43	drw.h util.h dmenu_path dmenu_run stest.1 $(SRC) \
44	dmenu-$(VERSION)	38	dmenu-$(VERSION)
45	@tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)	39	tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
46	@gzip dmenu-$(VERSION).tar	40	gzip dmenu-$(VERSION).tar
47	@rm -rf dmenu-$(VERSION)	41	rm -rf dmenu-$(VERSION)
48		42
49	install: all	43	install: all
50	@echo installing executables to $(DESTDIR)$(PREFIX)/bin	44	mkdir -p $(DESTDIR)$(PREFIX)/bin
51	@mkdir -p $(DESTDIR)$(PREFIX)/bin	45	cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
52	@cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin	46	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
53	@chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu	47	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
54	@chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path	48	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
55	@chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run	49	chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
56	@chmod 755 $(DESTDIR)$(PREFIX)/bin/stest	50	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
57	@echo installing manual pages to $(DESTDIR)$(MANPREFIX)/man1	51	sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
58	@mkdir -p $(DESTDIR)$(MANPREFIX)/man1	52	sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
59	@sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1	53	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
60	@sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1	54	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
61	@chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
62	@chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
63		55
64	uninstall:	56	uninstall:
65	@echo removing executables from $(DESTDIR)$(PREFIX)/bin	57	rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\
66	@rm -f $(DESTDIR)$(PREFIX)/bin/dmenu	58	$(DESTDIR)$(PREFIX)/bin/dmenu_path\
67	@rm -f $(DESTDIR)$(PREFIX)/bin/dmenu_path	59	$(DESTDIR)$(PREFIX)/bin/dmenu_run\
68	@rm -f $(DESTDIR)$(PREFIX)/bin/dmenu_run	60	$(DESTDIR)$(PREFIX)/bin/stest\
69	@rm -f $(DESTDIR)$(PREFIX)/bin/stest	61	$(DESTDIR)$(MANPREFIX)/man1/dmenu.1\
70	@echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1	62	$(DESTDIR)$(MANPREFIX)/man1/stest.1
71	@rm -f $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
72	@rm -f $(DESTDIR)$(MANPREFIX)/man1/stest.1
73		63
74	.PHONY: all options clean dist install uninstall	64	.PHONY: all options clean dist install uninstall