[elpa] externals/ada-mode a489c9d4ea: Build.sh now works properly

[Stephen Leake]

branch: externals/ada-mode
commit a489c9d4ea62299b7a745e626aefab8cba4aef7b
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    Build.sh now works properly
    
    * Makefile.conf: Delete; generated file.
    
    * .gitignore: Add more.
    
    * Makefile (clean): Improve.
    
    * build.sh: Fix bugs.
---
 .gitignore    | 8 +++++---
 Makefile      | 2 +-
 Makefile.conf | 4 ----
 build.sh      | 5 +----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index c5c341fb2a..d9f97eb120 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
-/ada-mode-pkg.el
-/ada-mode-autoloads.el
 *.elc
-ada_lr1_parse_table.txt
 *.exe
+*.parse_table
+ada-mode-autoloads.el
+ada-mode-pkg.el
+Makefile.conf
+ada_annex_p_lr1_parse_table.txt
 ada_mode_wisi_parse.gpr
 check.gpr
 obj/
diff --git a/Makefile b/Makefile
index a3699be733..5e6de64bc9 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ byte-compile-clean :
        cd ..; rm -f *.elc
 
 clean : force
-       rm -rf obj
+       rm -rf obj *parse_table*
 
 recursive-clean : force
        gprclean -r -P ada_mode_wisi_parse.gpr
diff --git a/Makefile.conf b/Makefile.conf
deleted file mode 100644
index a0bb14ddaf..0000000000
--- a/Makefile.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-HAVE_LIBADALANG := "no"
-HAVE_GNAT_UTIL := "no"
-HAVE_LIBADALANG := "yes"
-HAVE_GNAT_UTIL := "no"
diff --git a/build.sh b/build.sh
index d70e45ddca..6fad8f352b 100755
--- a/build.sh
+++ b/build.sh
@@ -33,11 +33,10 @@ gnatprep -DELPA="yes" $WISI_DIR/wisi.gpr.gp 
$WISI_DIR/wisi.gpr
 
 # Allow running build.sh again, since it often fails the first time.
 #  - Run gprclean, to allow changing compilers and other drastic things
-#  - Don't delete ada_lr1_parse_table.txt
 
 gprclean -r -P ada_mode_wisi_parse.gpr -aP$WISI_DIR
 
-cd $WISI_DIR; ./build-wisitoken-bnf-generate.sh
+gprbuild -p -j8 -P $WISI_DIR/wisi.gpr wisitoken-bnf-generate
 
 # We generate the Ada LR parse table .txt file here, because it is too
 # large to keep in ELPA. The code generated by wisitoken-bnf-generate
@@ -48,6 +47,4 @@ $WISI_DIR/wisitoken-bnf-generate --task_count 1 ada_annex_p.wy
 
 gprbuild -p -j8 -P ada_mode_wisi_parse.gpr -aP $WISI_DIR "$@"
 
-gzip -c -d -q ada_lr1_parse_table.txt.gz > ada_lr1_parse_table.txt
-
 # end of file