fix hcache ver gen

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 5c355517027f7d491f7770b58d0f2a968a5c3bcd..dfd71ab1c1b25b95cd1df7a6fbe177fa5842ba86 100644 (file)
--- 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 d4194c0d57e455a43312464b2fc361f6feaed3b8..495864e4ae3d2ce60c5996c8bb03398195711a8a 100755 (executable)
--- 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"
     ;;