Skip to content

Commit a314412

Browse files
committed
Makefile: just show the compiler output
Don't be fancy and just show the actual output so debugging is simpler.
1 parent a9eae39 commit a314412

File tree

1 file changed

+28
-38
lines changed

1 file changed

+28
-38
lines changed

Makefile

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,60 +15,50 @@ options:
1515
@echo "CC = $(CC)"
1616

1717
.c.o:
18-
@echo CC $<
19-
@$(CC) -c $(CFLAGS) $<
18+
$(CC) -c $(CFLAGS) $<
2019

2120
config.h:
22-
@echo creating $@ from config.def.h
23-
@cp config.def.h $@
21+
cp config.def.h $@
2422

2523
$(OBJ): arg.h config.h config.mk drw.h
2624

2725
dmenu: dmenu.o drw.o util.o
28-
@echo CC -o $@
29-
@$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
26+
$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
3027

3128
stest: stest.o
32-
@echo CC -o $@
33-
@$(CC) -o $@ stest.o $(LDFLAGS)
29+
$(CC) -o $@ stest.o $(LDFLAGS)
3430

3531
clean:
36-
@echo cleaning
37-
@rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
32+
rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
3833

3934
dist: clean
40-
@echo creating dist tarball
41-
@mkdir -p dmenu-$(VERSION)
42-
@cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1 \
43-
drw.h util.h dmenu_path dmenu_run stest.1 $(SRC) \
35+
mkdir -p dmenu-$(VERSION)
36+
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)\
4438
dmenu-$(VERSION)
45-
@tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
46-
@gzip dmenu-$(VERSION).tar
47-
@rm -rf dmenu-$(VERSION)
39+
tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
40+
gzip dmenu-$(VERSION).tar
41+
rm -rf dmenu-$(VERSION)
4842

4943
install: all
50-
@echo installing executables to $(DESTDIR)$(PREFIX)/bin
51-
@mkdir -p $(DESTDIR)$(PREFIX)/bin
52-
@cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
53-
@chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
54-
@chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
55-
@chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
56-
@chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
57-
@echo installing manual pages to $(DESTDIR)$(MANPREFIX)/man1
58-
@mkdir -p $(DESTDIR)$(MANPREFIX)/man1
59-
@sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
60-
@sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
61-
@chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
62-
@chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
44+
mkdir -p $(DESTDIR)$(PREFIX)/bin
45+
cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
46+
chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
47+
chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
48+
chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
49+
chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
50+
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
51+
sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
52+
sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
53+
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
54+
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
6355

6456
uninstall:
65-
@echo removing executables from $(DESTDIR)$(PREFIX)/bin
66-
@rm -f $(DESTDIR)$(PREFIX)/bin/dmenu
67-
@rm -f $(DESTDIR)$(PREFIX)/bin/dmenu_path
68-
@rm -f $(DESTDIR)$(PREFIX)/bin/dmenu_run
69-
@rm -f $(DESTDIR)$(PREFIX)/bin/stest
70-
@echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1
71-
@rm -f $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
72-
@rm -f $(DESTDIR)$(MANPREFIX)/man1/stest.1
57+
rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\
58+
$(DESTDIR)$(PREFIX)/bin/dmenu_path\
59+
$(DESTDIR)$(PREFIX)/bin/dmenu_run\
60+
$(DESTDIR)$(PREFIX)/bin/stest\
61+
$(DESTDIR)$(MANPREFIX)/man1/dmenu.1\
62+
$(DESTDIR)$(MANPREFIX)/man1/stest.1
7363

7464
.PHONY: all options clean dist install uninstall

0 commit comments

Comments
 (0)