From: Richard Russon <rich@flatcap.org>
Date: Thu, 5 Jul 2018 09:49:42 +0000 (+0100)
Subject: fix hcache ver gen
X-Git-Tag: 2019-10-25~762^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a5996c50bca3711b92c3bdbb6b0a5a1e6eec766;p=neomutt

fix hcache ver gen
---

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 5c3555170..dfd71ab1c 100644
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -262,16 +262,23 @@ git_ver.h: $(ALL_FILES)
 	cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \
 	rm -f git_ver.h.tmp
 
-hcache/hcversion.h:	$(SRCDIR)/mutt.h $(SRCDIR)/mutt/address.h \
-			$(SRCDIR)/mutt/list.h $(SRCDIR)/mutt/buffer.h \
-			$(SRCDIR)/mutt/parameter.h $(SRCDIR)/mutt/body.h \
-			$(SRCDIR)/mutt/envelope.h $(SRCDIR)/mutt/header.h \
+hcache/hcversion.h:	$(SRCDIR)/mutt/address.h \
+			$(SRCDIR)/mutt/body.h \
+			$(SRCDIR)/mutt/buffer.h \
+			$(SRCDIR)/mutt/envelope.h \
+			$(SRCDIR)/mutt/header.h \
+			$(SRCDIR)/mutt/list.h \
+			$(SRCDIR)/mutt/parameter.h \
 			$(SRCDIR)/hcache/hcachever.sh
 	$(MKDIR_P) $(PWD)/hcache
-	( echo '#include "config.h"'; echo '#include "mutt.h"'; \
-	echo '#include "mutt/address.h"'; echo '#include "mutt/list.h"'; \
-	echo '#include "mutt/buffer.h"'; echo '#include "mutt/parameter.h"'; \
-	echo '#include "mutt/header.h"';) | $(CPP) $(CFLAGS) - | \
+	( echo '#include "config.h"'; \
+	echo '#include "mutt/address.h"'; \
+	echo '#include "mutt/body.h"'; \
+	echo '#include "mutt/buffer.h"'; \
+	echo '#include "mutt/envelope.h"'; \
+	echo '#include "mutt/header.h"'; \
+	echo '#include "mutt/list.h"'; \
+	echo '#include "mutt/parameter.h"';) | $(CPP) $(CFLAGS) - | \
 	sh $(SRCDIR)/hcache/hcachever.sh hcache/hcversion.h
 
 # clean
diff --git a/hcache/hcachever.sh b/hcache/hcachever.sh
index d4194c0d5..495864e4a 100755
--- a/hcache/hcachever.sh
+++ b/hcache/hcachever.sh
@@ -46,7 +46,7 @@ getstruct () {
   done
 
   case $STRUCT in
-    Address|ListNode|Buffer|Parameter|Body|Envelope|Header)
+    Address|Body|Buffer|Envelope|Header|ListNode|Parameter)
       BODY=`cleanbody "$BODY"`
       echo "$STRUCT: $BODY"
     ;;