From ba6aa26688d0f97b53a3fd8eea99ff3cb238e9c7 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Sun, 26 Jul 2020 05:04:28 +0900 Subject: [PATCH 1/2] Move \*.el files into lisp/ directory --- php-align.el => lisp/php-align.el | 0 php-face.el => lisp/php-face.el | 0 php-mode-debug.el => lisp/php-mode-debug.el | 0 php-mode.el => lisp/php-mode.el | 0 php-project.el => lisp/php-project.el | 0 php.el => lisp/php.el | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename php-align.el => lisp/php-align.el (100%) rename php-face.el => lisp/php-face.el (100%) rename php-mode-debug.el => lisp/php-mode-debug.el (100%) rename php-mode.el => lisp/php-mode.el (100%) rename php-project.el => lisp/php-project.el (100%) rename php.el => lisp/php.el (100%) diff --git a/php-align.el b/lisp/php-align.el similarity index 100% rename from php-align.el rename to lisp/php-align.el diff --git a/php-face.el b/lisp/php-face.el similarity index 100% rename from php-face.el rename to lisp/php-face.el diff --git a/php-mode-debug.el b/lisp/php-mode-debug.el similarity index 100% rename from php-mode-debug.el rename to lisp/php-mode-debug.el diff --git a/php-mode.el b/lisp/php-mode.el similarity index 100% rename from php-mode.el rename to lisp/php-mode.el diff --git a/php-project.el b/lisp/php-project.el similarity index 100% rename from php-project.el rename to lisp/php-project.el diff --git a/php.el b/lisp/php.el similarity index 100% rename from php.el rename to lisp/php.el From 420c46df80bad9563c8035d54e1d97455e6bcbe4 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Sun, 26 Jul 2020 05:13:53 +0900 Subject: [PATCH 2/2] Fix Makefile for moved lisp/*.el files --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index dc40c85b..b9f8121e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ EMACS ?= emacs -ELS = php.el php-align.el php-face.el php-project.el php-mode.el php-mode-debug.el +ELS = lisp/php.el lisp/php-align.el lisp/php-face.el lisp/php-project.el lisp/php-mode.el lisp/php-mode-debug.el AUTOLOADS = php-mode-autoloads.el ELCS = $(ELS:.el=.elc) %.elc: %.el - $(EMACS) -Q -batch -L . -f batch-byte-compile $< + $(EMACS) -Q -batch -L lisp/ -f batch-byte-compile $< all: autoloads $(ELCS) authors @@ -24,11 +24,11 @@ AUTHORS.md: etc/git/AUTHORS.md.in .mailmap autoloads: $(AUTOLOADS) -$(AUTOLOADS): php.el php-align.el php-face.el php-project.el php-mode-debug.el php-mode.el - $(EMACS) -Q -batch -L . --eval \ +$(AUTOLOADS): lisp/php.el lisp/php-align.el lisp/php-face.el lisp/php-project.el lisp/php-mode-debug.el lisp/php-mode.el + $(EMACS) -Q -batch -L lisp/ --eval \ "(progn \ (require 'package) \ - (package-generate-autoloads \"php-mode\" default-directory))" + (package-generate-autoloads \"php-mode\" (expand-file-name \"lisp\")))" clean: rm -f $(ELCS) $(AUTOLOADS) @@ -52,6 +52,7 @@ dev: # command. test: clean all touch tests/project/1/.git - $(EMACS) -Q -batch -L . -l tests/php-mode-test.el -f ert-run-tests-batch-and-exit + $(EMACS) -Q -batch -l lisp/php-mode-autoloads.el \ + -l tests/php-mode-test.el -f ert-run-tests-batch-and-exit .PHONY: all authors autoloads clean test