branch: elpa/scala-mode
commit d8a141b73095d6233572c341d8f0ec4437d914d6
Author: Heikki Vesalainen <heikkivesalai...@yahoo.com>
Commit: Heikki Vesalainen <heikkivesalai...@yahoo.com>
Makefile clean-up
---
Makefile | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 7cdc5f7..af599f0 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,8 @@ SOURCE_DIR = $(ROOT)
# Emacs Lisp
ELISP_COMMAND ?= emacs
-ELISP_OPTIONS += -batch -no-site-file
+ELISP_OPTIONS += -batch -no-site-file -q
ELISP_OPTIONS += -L $(ROOT)
-ELISP_OPTIONS += -f batch-byte-compile
ELISP_FILES += scala-mode2-lib
@@ -30,10 +29,10 @@ ELISP_FILES += scala-mode2-paragraph
ELISP_FILES += scala-mode2-fontlock
ELISP_FILES += scala-mode2-map
ELISP_FILES += scala-mode2-sbt
-ELISP_FILES += scala-mode2-pkg
-
ELISP_SOURCES += $(ELISP_FILES:%=$(SOURCE_DIR)/%.el)
+PKG_FILE += scala-mode2-pkg.el
+
##############################################################################
RM ?= rm -f
@@ -41,7 +40,7 @@ RMDIR ?= rmdir
TOUCH ?= touch
# Strip the version out of the pkg file
-VERSION = $(shell ${ELISP_COMMAND} --batch --eval '(princ
(format "%s\n" (car (cddr (read (find-file "scala-mode2-pkg.el"))))))' | grep
-v Loading)
+VERSION := $(shell ${ELISP_COMMAND} $(ELISP_OPTIONS) --eval
'(princ (format "%s\n" (nth 2 (read (find-file "scala-mode2-pkg.el")))))')
##############################################################################
# Commands
@@ -50,8 +49,8 @@ all: .latest-build
clean:
$(RM) *.elc .latest-* autoloads.el scala-mode2-$(VERSION).tar
- [ -d scala-mode2-$(VERSION) ] && $(RM) scala-mode2-$(VERSION)/*
- [ -d scala-mode2-$(VERSION) ] && $(RMDIR) scala-mode2-$(VERSION)
+ [ ! -d scala-mode2-$(VERSION) ] || $(RM) scala-mode2-$(VERSION)/*
+ [ ! -d scala-mode2-$(VERSION) ] || $(RMDIR) scala-mode2-$(VERSION)
.PHONY: all
.PHONY: clean
@@ -60,17 +59,17 @@ clean:
# Rules
.latest-build: $(ELISP_SOURCES)
- $(ELISP_COMMAND) $(ELISP_OPTIONS) $(ELISP_SOURCES)
+ $(ELISP_COMMAND) $(ELISP_OPTIONS) -f batch-byte-compile $(ELISP_SOURCES)
@$(TOUCH) $@
##############################################################################
autoloads: $(ELISP_SOURCES)
- $(ELISP_COMMAND) -batch -q --no-site-file --eval "(setq
make-backup-files nil)" --eval "(setq generated-autoload-file (expand-file-name
\"autoloads.el\"))" -f batch-update-autoloads `pwd`
+ $(ELISP_COMMAND) $(ELISP_OPTIONS) --eval "(setq make-backup-files nil)"
--eval "(setq generated-autoload-file (expand-file-name \"autoloads.el\"))" -f
batch-update-autoloads `pwd`
package:
mkdir -p scala-mode2-$(VERSION)
- cp $(ELISP_SOURCES) scala-mode2-$(VERSION)
+ cp $(ELISP_SOURCES) $(PKG_FILE) scala-mode2-$(VERSION)
tar cf scala-mode2-$(VERSION).tar scala-mode2-$(VERSION)
