nnn

commit f618b788668ed00570724e539a96051bd417ebdc
parent f2a38b0e22febe56d25b4f3b88e148d591d765e2
Author: N-R-K <nrk@disroot.org>
Date:   Tue, 26 Jul 2022 14:56:49 +0000

Makefile: more robust generated header tracking (#1439)

give each generated header it's own unique file so that it's not
possible to try and build `O_EMOJI=1` with the generated header for
`O_NERD=1`.
Diffstat:
M
Makefile
 | 
26
++++++++++++++------------
M
src/nnn.c
 | 
2
+-

2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
@@ -95,15 +95,18 @@ ifeq ($(strip $(O_CTX8)),1)
 endif
 
 ifeq ($(strip $(O_ICONS)),1)
-	CPPFLAGS += -DICONS_IN_TERM
+	ICONS_INCLUDE = icons-generated-icons-in-term.h
+	CPPFLAGS += -DICONS_IN_TERM -DICONS_INCLUDE=\"$(ICONS_INCLUDE)\"
 endif
 
 ifeq ($(strip $(O_NERD)),1)
-	CPPFLAGS += -DNERD
+	ICONS_INCLUDE = icons-generated-nerd.h
+	CPPFLAGS += -DNERD -DICONS_INCLUDE=\"$(ICONS_INCLUDE)\"
 endif
 
 ifeq ($(strip $(O_EMOJI)),1)
-	CPPFLAGS += -DEMOJI
+	ICONS_INCLUDE = icons-generated-emoji.h
+	CPPFLAGS += -DEMOJI -DICONS_INCLUDE=\"$(ICONS_INCLUDE)\"
 endif
 
 ifeq ($(strip $(O_QSORT)),1)
@@ -191,13 +194,13 @@ ifeq ($(strip $(O_QSORT)),1)
 	HEADERS += src/qsort.h
 endif
 ifeq ($(strip $(O_EMOJI)),1)
-	HEADERS += src/icons.h src/icons-generated.h
+	HEADERS += src/icons.h src/$(ICONS_INCLUDE)
 endif
 ifeq ($(strip $(O_NERD)),1)
-	HEADERS += src/icons.h src/icons-generated.h
+	HEADERS += src/icons.h src/$(ICONS_INCLUDE)
 endif
 ifeq ($(strip $(O_ICONS)),1)
-	HEADERS += src/icons.h src/icons-generated.h src/icons-in-terminal.h
+	HEADERS += src/icons.h src/$(ICONS_INCLUDE) src/icons-in-terminal.h
 endif
 
 all: $(BIN)
@@ -207,16 +210,15 @@ $(BIN): $(SRC) $(HEADERS) Makefile
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(GETTIME_C) $< $(LDLIBS)
 	@$(MAKE) --silent postpatch
 
-src/icons-generated.h: src/icons-hash-gen
-	@./$< > $@
-src/icons-hash-gen: src/icons-hash.c src/nnn.c src/icons.h src/nnn.h
-	$(CC) $(CPPFLAGS) -DICONS_GENERATE -o $@ src/icons-hash.c
-
 # targets for backwards compatibility
 debug: $(BIN)
 norl: $(BIN)
 nolc: $(BIN)
 
+src/$(ICONS_INCLUDE): src/icons-hash.c src/icons.h src/icons-in-terminal.h
+	$(CC) $(CPPFLAGS) -DICONS_GENERATE -o src/icons-hash-gen src/icons-hash.c
+	./src/icons-hash-gen > $@
+
 install-desktop: $(DESKTOPFILE)
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPPREFIX)
 	$(INSTALL) -m 0644 $(DESKTOPFILE) $(DESTDIR)$(DESKTOPPREFIX)
@@ -318,7 +320,7 @@ upload-local: sign static musl
 	    --upload-file $(BIN)-musl-static-$(VERSION).x86_64.tar.gz
 
 clean:
-	$(RM) -f $(BIN) nnn-$(VERSION).tar.gz *.sig $(BIN)-static $(BIN)-static-$(VERSION).x86_64.tar.gz $(BIN)-icons-static $(BIN)-icons-static-$(VERSION).x86_64.tar.gz $(BIN)-nerd-static $(BIN)-nerd-static-$(VERSION).x86_64.tar.gz $(BIN)-emoji-static $(BIN)-emoji-static-$(VERSION).x86_64.tar.gz $(BIN)-musl-static $(BIN)-musl-static-$(VERSION).x86_64.tar.gz src/icons-hash-gen src/icons-generated.h
+	$(RM) -f $(BIN) nnn-$(VERSION).tar.gz *.sig $(BIN)-static $(BIN)-static-$(VERSION).x86_64.tar.gz $(BIN)-icons-static $(BIN)-icons-static-$(VERSION).x86_64.tar.gz $(BIN)-nerd-static $(BIN)-nerd-static-$(VERSION).x86_64.tar.gz $(BIN)-emoji-static $(BIN)-emoji-static-$(VERSION).x86_64.tar.gz $(BIN)-musl-static $(BIN)-musl-static-$(VERSION).x86_64.tar.gz src/icons-hash-gen src/icons-generated-*.h
 
 checkpatches:
 	./patches/check-patches.sh
diff --git a/src/nnn.c b/src/nnn.c
@@ -125,7 +125,7 @@
 
 #if defined(ICONS_IN_TERM) || defined(NERD) || defined(EMOJI)
 #define ICONS_ENABLED
-#include "icons-generated.h"
+#include ICONS_INCLUDE
 #include "icons-hash.c"
 #include "icons.h"
 #endif