From f9bae01ee8a7be0e4e992ef3ce856b31d32019c9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 29 Jun 2014 17:01:51 -0700 Subject: [PATCH] * update_autogen: Find loaddefs targets rather than parsing lisp/Makefile.in * lisp/Makefile.in: Comment. --- admin/ChangeLog | 5 +++++ admin/update_autogen | 12 ++++++++---- lisp/Makefile.in | 1 - 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index fc58259443f..a20e93d38c2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2014-06-30 Glenn Morris + + * update_autogen: Find loaddefs targets rather than + parsing lisp/Makefile.in + 2014-06-29 Glenn Morris * update_autogen: Remove need to cd into/out of lisp/. diff --git a/admin/update_autogen b/admin/update_autogen index 90431fa6301..ef0edfef50c 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -322,15 +322,19 @@ EOF echo "Finding loaddef targets..." -sed -n -e '/^AUTOGEN_VCS/,/^$/p' lisp/Makefile.in | \ - sed -e '/AUTOGEN_VCS/d' -e '/^$/d' -e 's/\\//' \ - >| $tempfile || die "sed error" +find lisp -name '*.el' -exec grep '^;.*generated-autoload-file:' {} + | \ + sed -e '/loaddefs\|esh-groups/d' -e 's|/[^/]*: "|/|' -e 's/"//g' \ + >| $tempfile || die "Error finding targets" genfiles= while read genfile; do - genfile=lisp/$genfile + ## Or we can just use sort -u when making tempfile... + case " $genfiles " in + *" $genfile "*) continue ;; + esac + [ -r $genfile ] || die "Unable to read $genfile" genfiles="$genfiles $genfile" diff --git a/lisp/Makefile.in b/lisp/Makefile.in index fefbd5cda56..45a964b0d70 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -71,7 +71,6 @@ AUTOGENEL = loaddefs.el \ org/org-loaddefs.el # Versioned files that are the value of someone's `generated-autoload-file'. -# Note that update_loaddefs parses this. AUTOGEN_VCS = \ ps-print.el \ obsolete/tpu-edt.el \ -- 2.39.2