branch: master commit 2e271c69bb277dcf6193517a78b658ad7b4c1e3a Author: Ian Dunn <du...@gnu.org> Commit: Ian Dunn <du...@gnu.org>
Moved lisp files into top-level directory. --- Makefile | 36 ++++++++++++++++++++----------- lisp/enwc-backend.el => enwc-backend.el | 0 lisp/enwc-cm.el => enwc-cm.el | 0 lisp/enwc-edit.el => enwc-edit.el | 0 lisp/enwc-nm.el => enwc-nm.el | 0 lisp/enwc-wicd.el => enwc-wicd.el | 0 lisp/enwc.el => enwc.el | 0 lisp/Makefile | 38 --------------------------------- 8 files changed, 24 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index a99c195..eba3a7d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # This is part of ENWC # -# Copyright (C) 2012-2016 Ian Dunn. +# Copyright (C) 2012-2017 Ian Dunn. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,25 +15,40 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -LISPDIR=lisp DOCDIR=doc/ -ALLSRC=$(wildcard $(LISPDIR)/*.el) -ALLELC=$(wildcard $(LISPDIR)/*.elc) - PREFIX=/usr/local INFODIR=$(PREFIX)/info SITELISP=$(PREFIX)/share/emacs/site-lisp/enwc +EMACS=emacs --batch +ALLSRC= enwc-backend.el enwc.el enwc-wicd.el enwc-nm.el +ALLELC=$(wildcard *.elc) + +SOURCE=$(ALLSRC) +TARGET=$(patsubst %.el,%.elc,$(SOURCE)) + .PHONY: all install lisp clean .PRECIOUS: %.elc all: lisp -lisp: - $(MAKE) -C $(LISPDIR) +lisp: $(ALLELC) + +%.elc: %.el + @$(EMACS) \ + -L "." \ + -f batch-byte-compile $< + +autoloads: enwc-autoloads.el -autoloads: - $(MAKE) -C $(LISPDIR) enwc-autoloads.el +enwc-autoloads.el: $(SOURCE) + @$(EMACS) \ + --eval "(require 'package)" \ + --eval "(setq inhibit-message t)" \ + --eval "(package-generate-autoloads \"enwc\" \"$$(pwd)\")" + +clean: + -rm -f *.elc install: install -m 644 $(ALLELC) $(SITELISP) @@ -42,6 +57,3 @@ install: uninstall: -rm -f $(SITELISP)/*.elc -rm -f $(SITELISP)/*.el - -clean: - $(MAKE) -C $(LISPDIR) clean diff --git a/lisp/enwc-backend.el b/enwc-backend.el similarity index 100% rename from lisp/enwc-backend.el rename to enwc-backend.el diff --git a/lisp/enwc-cm.el b/enwc-cm.el similarity index 100% rename from lisp/enwc-cm.el rename to enwc-cm.el diff --git a/lisp/enwc-edit.el b/enwc-edit.el similarity index 100% rename from lisp/enwc-edit.el rename to enwc-edit.el diff --git a/lisp/enwc-nm.el b/enwc-nm.el similarity index 100% rename from lisp/enwc-nm.el rename to enwc-nm.el diff --git a/lisp/enwc-wicd.el b/enwc-wicd.el similarity index 100% rename from lisp/enwc-wicd.el rename to enwc-wicd.el diff --git a/lisp/enwc.el b/enwc.el similarity index 100% rename from lisp/enwc.el rename to enwc.el diff --git a/lisp/Makefile b/lisp/Makefile deleted file mode 100644 index a51a016..0000000 --- a/lisp/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# This is part of ENWC -# -# Copyright (C) 2012-2017 Ian Dunn. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -EMACS=emacs --batch -ALLSRC= enwc-backend.el enwc.el enwc-wicd.el enwc-nm.el -ALLELC=$(wildcard *.elc) -SOURCE=$(ALLSRC) -TARGET=$(patsubst %.el,%.elc,$(SOURCE)) - -all: $(TARGET) - -%.elc: %.el - @$(EMACS) \ - -L "." \ - -f batch-byte-compile $< - -enwc-autoloads.el: $(SOURCE) - @$(EMACS) \ - --eval "(require 'package)" \ - --eval "(setq inhibit-message t)" \ - --eval "(package-generate-autoloads \"enwc\" \"$$(pwd)\")" - -clean: - -rm -f *.elc