branch: master
commit b49cde2b202a057eed453b1cc99a3c4128eeec6b
Author: rocky <ro...@gnu.org>
Commit: rocky <ro...@gnu.org>
Set EMACSLOADPATH in make. remove more .el lint
---
Makefile.am | 2 +-
autogen.sh | 1 +
common.mk | 10 ----------
common.mk.in | 25 +++++++++++++++++++++++++
configure.ac | 1 +
realgud.el | 4 ++++
test/Makefile.am | 1 -
test/bt-helper.el | 4 +---
test/test-buf-cmd.el | 1 +
test/test-regexp-gdb.el | 1 +
test/test-regexp-rdebug.el | 4 ++++
11 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e2fcd7a..5514e4b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ include common.mk
PHONY=check clean dist distclean test check-short check-terse install-short
-EXTRA_DIST+=common.mk README.md THANKS
+EXTRA_DIST=common.mk README.md THANKS $(lisp_files) test/gcd.py test/gcd.rb
test/gdb
if MAINTAINER_MODE
diff --git a/autogen.sh b/autogen.sh
index 8948b34..cbe8d87 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,6 @@
#!/bin/sh
ln -fs README.md README
+touch common.mk
autoreconf -vi && \
autoconf && {
echo "Running configure with --enable-maintainer-mode $@"
diff --git a/common.mk b/common.mk
deleted file mode 100644
index c8fc92a..0000000
--- a/common.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-lisp_files := $(wildcard *.el)
-lisp_LISP = $(lisp_files)
-EXTRA_DIST = $(lisp_files)
-MOSTLYCLEANFILES = *.elc
-
-short:
- $(MAKE) 2>&1 >/dev/null | ruby $(top_srcdir)/make-check-filter.rb
-
-%.short:
- $(MAKE) $(@:.short=) 2>&1 >/dev/null
diff --git a/common.mk.in b/common.mk.in
new file mode 100644
index 0000000..0a2358e
--- /dev/null
+++ b/common.mk.in
@@ -0,0 +1,25 @@
+lisp_files := $(wildcard *.el)
+lisp_LISP = $(lisp_files)
+MOSTLYCLEANFILES = *.elc
+
+short:
+ $(MAKE) 2>&1 >/dev/null | ruby $(top_srcdir)/make-check-filter.rb
+
+%.short:
+ $(MAKE) $(@:.short=) 2>&1 >/dev/null
+
+# This is the default rule, but we need to include an EMACLOADPATH
+.el.elc:
+ if test "$(EMACS)" != "no"; then \
+ am__dir=. am__subdir_includes=''; \
+ case $@ in */*) \
+ am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \
+ am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \
+ esac; \
+ test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
+ EMACSLOADPATH=$(EMACSLOADPATH) $(EMACS) --batch \
+ $(AM_ELCFLAGS) $(ELCFLAGS) \
+ $$am__subdir_includes -L $(builddir) -L $(srcdir) \
+ --eval "(defun byte-compile-dest-file (f) \"$@\")" \
+ --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \
+ else :; fi
diff --git a/configure.ac b/configure.ac
index a5f0706..d9cc1c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ AC_SUBST([lispdir_realgud])
AM_CONDITIONAL(INSTALL_EMACS_LISP, test "x$lispdir_realgud" != "x")
AC_CONFIG_FILES([Makefile \
+ common.mk \
realgud/Makefile \
realgud/common/Makefile \
realgud/common/buffer/Makefile \
diff --git a/realgud.el b/realgud.el
index 026dbb4..2035b9d 100644
--- a/realgud.el
+++ b/realgud.el
@@ -65,6 +65,10 @@
;;; Code:
+;; Press C-x C-e at the end of the next line configure the program in
+;; for building via "make" to get set up.
+;; (compile (format "EMACSLOADPATH=:%s:%s ./autogen.sh" (file-name-directory
(locate-library "test-simple.elc")) (file-name-directory (locate-library
"load-relative.elc")) (file-name-directory (locate-library "loc-changes.elc"))))
+
(require 'load-relative)
(defgroup realgud nil
diff --git a/test/Makefile.am b/test/Makefile.am
index c56f333..0fba6da 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,6 @@
include $(top_srcdir)/common.mk
PHONY=check test all check-elget test-elget help
-EXTRA_DIST += gcd.py gcd.rb gdb
#: overall help on running the make targets
help:
diff --git a/test/bt-helper.el b/test/bt-helper.el
index 5236a55..e836b26 100644
--- a/test/bt-helper.el
+++ b/test/bt-helper.el
@@ -37,9 +37,7 @@ for DEBUGGER-NAME and initializes it to STRING"
(goto-char (point-min))
(setq buffer-read-only nil)
(insert string)
- (font-lock-fontify-buffer)
- ;; Newer emacs's use:
- ;; (font-lock-ensure)
+ (font-lock-ensure)
(goto-char (point-min))
)
temp-bt
diff --git a/test/test-buf-cmd.el b/test/test-buf-cmd.el
index f54ddb1..48aa2ee 100644
--- a/test/test-buf-cmd.el
+++ b/test/test-buf-cmd.el
@@ -10,6 +10,7 @@
(declare-function realgud-cmdbuf-debugger-name 'realgud-buffer-command)
(declare-function realgud-cmdbuf-info-srcbuf-list 'realgud-buffer-command)
(declare-function realgud-cmdbuf-add-srcbuf 'realgud-buffer-command)
+(declare-function realgud-cmdbuf? 'realgud-buffer-command)
(test-simple-start)
diff --git a/test/test-regexp-gdb.el b/test/test-regexp-gdb.el
index fcf8fa9..b649e78 100644
--- a/test/test-regexp-gdb.el
+++ b/test/test-regexp-gdb.el
@@ -16,6 +16,7 @@
(defvar loc-pat) (defvar prompt-pat) (defvar test-s1)
(defvar file-group) (defvar line-group) (defvar test-pos)
(defvar test-dbgr) (defvar test-text) (defvar realgud-bt-re)
+ (defvar realgud:gdb-pat-hash)
)
; Some setup usually done in setting up the buffer.
diff --git a/test/test-regexp-rdebug.el b/test/test-regexp-rdebug.el
index 2c37d41..c57dc23 100644
--- a/test/test-regexp-rdebug.el
+++ b/test/test-regexp-rdebug.el
@@ -9,6 +9,10 @@
(test-simple-start)
+(eval-when-compile
+ (defvar realgud-rdebug-pat-hash)
+)
+
(setup-regexp-vars realgud-rdebug-pat-hash)
(setq rails-bt (gethash "rails-backtrace" realgud-rdebug-pat-hash))
