(wrong string) ée

From: <git_AT_suckless.org>
Date: Thu, 7 Dec 2017 18:02:07 +0100 (CET)

commit c8c786ee5a16fec99414d6064a2f16a2745d18dd
Author: Mattias Andrée <maandree_AT_kth.se>
AuthorDate: Tue Dec 5 23:10:53 2017 +0100
Commit: Mattias Andrée <maandree_AT_kth.se>
CommitDate: Tue Dec 5 23:12:51 2017 +0100

    Makefile: Use .bo instead of .mcb.o, and $(HDR) instead of *.h
    
    Signed-off-by: Mattias Andrée <maandree_AT_kth.se>

diff --git a/.gitignore b/.gitignore
index c9f0f51..0dbd5d6 100644
--- a/.gitignore
+++ b/.gitignore
_AT_@ -6,6 +6,7 @@
 *.swo
 *.swp
 *.o
+*.bo
 *.out
 /platform.h
 /generate-macros
diff --git a/Makefile b/Makefile
index 3eb6163..92e2977 100644
--- a/Makefile
+++ b/Makefile
_AT_@ -120,23 +120,23 @@ COMMON_OBJ =\
         stream.o
 
 HDR =\
- arg.h\
- common.h\
- define-functions.h\
- stream.h\
- util.h\
- util/to.h\
- util/jobs.h\
- util/emalloc.h\
- util/eopen.h\
- util/endian.h\
- util/colour.h\
- util/io.h\
- util/efflush.h\
- util/efunc.h\
- util/eprintf.h\
- util/fshut.h\
- video-math.h
+ src/arg.h\
+ src/common.h\
+ src/define-functions.h\
+ src/stream.h\
+ src/util.h\
+ src/util/to.h\
+ src/util/jobs.h\
+ src/util/emalloc.h\
+ src/util/eopen.h\
+ src/util/endian.h\
+ src/util/colour.h\
+ src/util/io.h\
+ src/util/efflush.h\
+ src/util/efunc.h\
+ src/util/eprintf.h\
+ src/util/fshut.h\
+ src/video-math.h
 
 MISCFILES =\
         Makefile\
_AT_@ -168,10 +168,10 @@ mcb: blind-mcb
 %: %.o $(COMMON_OBJ)
         $(CC) -o $_AT_ $^ $(LDFLAGS)
 
-%.o: src/%.c src/*.h src/*/*.h platform.h
+%.o: src/%.c $(HDR) platform.h
         $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $_AT_ $<
 
-%.mcb.o: src/%.c src/*.h src/*/*.h platform.h
+%.bo: src/%.c $(HDR) platform.h
         $(CC) $(CFLAGS) $(CPPFLAGS) -Dmain="$$(printf 'main_%s\n' $* | tr -- - _)" -c -o $_AT_ $<
 
 blind-mcb.c: Makefile
_AT_@ -188,7 +188,7 @@ blind-mcb.c: Makefile
         printf 'return 1;\n' >> blind-mcb.c
         printf '}\n' >> blind-mcb.c
 
-blind-mcb: blind-mcb.o $(BIN:=.mcb.o) $(COMMON_OBJ)
+blind-mcb: blind-mcb.o $(BIN:=.bo) $(COMMON_OBJ)
         $(CC) -o $_AT_ $^ $(LDFLAGS)
 
 generate-macros: src/generate-macros.c
_AT_@ -247,8 +247,10 @@ dist:
         mkdir -p "blind-$(VERSION)/src/util" "blind-$(VERSION)/man"
         cp $(MISCFILES) $(SCRIPTS) "blind-$(VERSION)"
         cd man && cp $(MAN1) $(MAN7) "../blind-$(VERSION)/man"
- set -e && cd src && for s in $(SRC) $(HDR); do \
+ set -e && cd src && for s in $(SRC); do \
                 cp "$$s" "../blind-$(VERSION)/src/$$s"; done
+ set -e && for s in $(HDR); do \
+ cp "$$s" "../blind-$(VERSION)/$$s"; done
         set -e && for e in $(EXAMPLEDIRS); do \
                 mkdir -p "blind-$(VERSION)/examples/$$e"; done
         set -e && cd examples && for e in $(EXAMPLEFILES); \
_AT_@ -258,9 +260,9 @@ dist:
         rm -rf "blind-$(VERSION)"
 
 clean:
- -rm -f $(BIN) *.o blind-$(VERSION).tar.gz platform.h generate-macros
- -rm -f blind-mcb.c blind-mcb.o blind-mcb
- -rm -rf "blind-$(VERSION)"
+ -rm -f -- $(BIN) *.o blind-$(VERSION).tar.gz platform.h generate-macros
+ -rm -f -- blind-mcb.c blind-mcb *.bo
+ -rm -rf -- "blind-$(VERSION)"
 
 
 .PHONY: all mcb install install-mcb uninstall dist clean
Received on Thu Dec 07 2017 - 18:02:07 CET