branch: externals/csharp-mode commit 1574d3eb4182d81ff98187fa456c0eb70868facc Merge: 26e2430 e277562 Author: Jostein Kjønigsen <jost...@kjonigsen.net> Commit: Jostein Kjønigsen <jost...@kjonigsen.net>
Merge pull request #32 from binki/master Makefile tweaks --- makefile | 6 +++--- run-travis-ci.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index a095924..061ce26 100644 --- a/makefile +++ b/makefile @@ -4,10 +4,12 @@ PACKAGE_NAME:=$(PACKAGE_SHORTNAME)-$(VERSION) PACKAGE_DIR:=./.tmp/$(PACKAGE_NAME) #PACKAGE_DIR:=/tmp/$(PACKAGE_NAME) -EMACS=$(shell which emacs) -Q -batch -L . +EMACS="$(shell which emacs)" -Q -batch -L . ELS = csharp-mode.el csharp-mode-tests.el ELCS = $(ELS:.el=.elc) +all: $(ELCS) test package + package: $(PACKAGE_DIR) tar cvf ../$(PACKAGE_NAME).tar --exclude="*#" --exclude="*~" --exclude="*tests*" --exclude="test-files" --exclude "*-pkg.el.template*" --exclude="makefile" --exclude="run-travis-ci.sh" -C $(PACKAGE_DIR)/.. $(PACKAGE_NAME) @@ -22,8 +24,6 @@ test: %.elc: %.el $(EMACS) -f batch-byte-compile $< -all: $(ELCS) test package - clean: rm -f ../$(PACKAGE_NAME).tar rm -rf $(PACKAGE_DIR) diff --git a/run-travis-ci.sh b/run-travis-ci.sh index f73d79d..e255a6a 100755 --- a/run-travis-ci.sh +++ b/run-travis-ci.sh @@ -11,4 +11,4 @@ echo "ECUKES_EMACS = $ECUKES_EMACS" echo # bytecompile, tests, package -make all +make