diff options
| author | Glenn Morris | 2013-11-29 18:06:34 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-11-29 18:06:34 -0800 |
| commit | f9b697ddaa60742d4a60b1fa4ab37efc2c3cb1e1 (patch) | |
| tree | 2983eafdf74ab173b7072c5722f0ef64525814d6 /lisp/Makefile.in | |
| parent | a64133bd252caf29a0a3ab6732ac1c76c91e17cb (diff) | |
| download | emacs-f9b697ddaa60742d4a60b1fa4ab37efc2c3cb1e1.tar.gz emacs-f9b697ddaa60742d4a60b1fa4ab37efc2c3cb1e1.zip | |
Stop keeping (all but one) generated cedet grammar files in the repository
* configure.ac (SUBDIR_MAKEFILES, AC_CONFIG_FILES):
Add admin/grammars Makefile.
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Also clean admin/grammars, if present.
* admin/grammars/README: Remove.
* admin/grammars/Makefile.in: New file.
* admin/grammars/c.by, admin/grammars/java-tags.wy, admin/grammars/js.wy:
* admin/grammars/python.wy: Update declarations to match generated outputs.
* lisp/Makefile.in (semantic): New.
(compile-main): Depend on semantic.
* lisp/cedet/semantic/bovine/grammar.el (bovine--make-parser-1):
New function, split from bovine-make-parsers.
(bovine-make-parsers): Use bovine--make-parser-1.
(bovine-batch-make-parser): New function.
* lisp/cedet/semantic/wisent/grammar.el (wisent--make-parser-1):
New function, split from wisent-make-parsers.
(wisent-make-parsers): Use wisent--make-parser-1.
(wisent-batch-make-parser): New function.
* lisp/cedet/semantic/db.el (semanticdb-save-all-db):
Avoid prompting in batch mode.
* lisp/cedet/semantic/grammar.el (semantic-grammar-footer-template):
Disable version-control and autoloads in the output.
(semantic-grammar-create-package):
Add option to return nil if output is up-to-date.
* lisp/cedet/semantic/bovine/c-by.el, lisp/cedet/semantic/bovine/make-by.el:
* lisp/cedet/semantic/bovine/scm-by.el, lisp/cedet/semantic/wisent/javat-wy.el:
* lisp/cedet/semantic/wisent/js-wy.el, lisp/cedet/semantic/wisent/python-wy.el:
* lisp/cedet/srecode/srt-wy.el: Remove generated files from repository.
* .bzrignore: Update for this.
Diffstat (limited to 'lisp/Makefile.in')
| -rw-r--r-- | lisp/Makefile.in | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 391e50c8b7d..9c9eacfd386 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -296,7 +296,7 @@ compile-targets: $(TARGETS) | |||
| 296 | 296 | ||
| 297 | # Compile all the Elisp files that need it. Beware: it approximates | 297 | # Compile all the Elisp files that need it. Beware: it approximates |
| 298 | # `no-byte-compile', so watch out for false-positives! | 298 | # `no-byte-compile', so watch out for false-positives! |
| 299 | compile-main: leim compile-clean | 299 | compile-main: leim semantic compile-clean |
| 300 | @(cd $(lisp) && $(setwins); \ | 300 | @(cd $(lisp) && $(setwins); \ |
| 301 | els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \ | 301 | els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \ |
| 302 | for el in $$els; do \ | 302 | for el in $$els; do \ |
| @@ -320,10 +320,18 @@ compile-clean: | |||
| 320 | fi \ | 320 | fi \ |
| 321 | done | 321 | done |
| 322 | 322 | ||
| 323 | .PHONY: leim | 323 | .PHONY: leim semantic |
| 324 | leim: | 324 | leim: |
| 325 | cd ../leim && $(MAKE) $(MFLAGS) all EMACS="$(EMACS)" | 325 | cd ../leim && $(MAKE) $(MFLAGS) all EMACS="$(EMACS)" |
| 326 | 326 | ||
| 327 | # FIXME. Yuck. | ||
| 328 | semantic: | ||
| 329 | case ${EMACS} in \ | ||
| 330 | .*) EMACS="../${EMACS}" ;; \ | ||
| 331 | *) EMACS="${EMACS}" ;; \ | ||
| 332 | esac; \ | ||
| 333 | cd ../admin/grammars && $(MAKE) $(MFLAGS) all EMACS="$${EMACS}" | ||
| 334 | |||
| 327 | # Compile all Lisp files, but don't recompile those that are up to | 335 | # Compile all Lisp files, but don't recompile those that are up to |
| 328 | # date. Some .el files don't get compiled because they set the | 336 | # date. Some .el files don't get compiled because they set the |
| 329 | # local variable no-byte-compile. | 337 | # local variable no-byte-compile. |