summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-08-15 00:10:32 +0200
committerBastien Guerry <bzg@altern.org>2012-08-15 00:10:32 +0200
commit510f6464b06932406051fd0983586f6c1680e098 (patch)
tree0151a04bfd6433253cc9627bc8a1d3cfbc84bbc1
parent32e3257c2d74de7287eb35d3fbd0e4e80543e5f7 (diff)
downloadorg-mode-510f6464b06932406051fd0983586f6c1680e098.tar.gz
Revert "Makefile: allow for different compilation methods"
This reverts commit 3e63c3e97a22339a05674495b5e60c16d6aca67c.
-rw-r--r--Makefile2
-rw-r--r--default.mk7
-rw-r--r--lisp/Makefile30
-rw-r--r--targets.mk23
4 files changed, 25 insertions, 37 deletions
diff --git a/Makefile b/Makefile
index 71e2765..0463541 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,8 @@ help helpall::
helpall::
$(info make test - ditto)
$(info make compile-dirty - build only stale Org ELisp files)
+ $(info make compile-single - build using one Emacs process per file)
+ $(info make compile-source - ditto, but immediately remove byte-compiled file )
$(info make test-dirty - check without building first)
$(info )
$(info Compatibility)
diff --git a/default.mk b/default.mk
index 8476cae..2ac552b 100644
--- a/default.mk
+++ b/default.mk
@@ -131,10 +131,3 @@ SUDO = sudo
# Name of the program to install info files
# INSTALL_INFO = ginstall-info # Debian: avoid harmless warning message
INSTALL_INFO = install-info
-
-# target variant for 'compile'
-# _COMPILE_ = single # one Emacs process per compilation
-# _COMPILE_ = source # ditto, but remove compiled file immediately
-# _COMPILE_ = slint1 # possibly elicit more warnings
-# _COMPILE_ = slint2 # possibly elicit even more warnings
-_COMPILE_ = dirall
diff --git a/lisp/Makefile b/lisp/Makefile
index c547810..ee0caaf 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -7,31 +7,23 @@ endif
LISPV = org-version.el
LISPI = org-install.el
LISPA = $(LISPV) $(LISPI)
-LISPF = $(filter-out $(LISPA),$(sort $(wildcard *.el)))
+LISPF = $(filter-out $(LISPA),$(wildcard *.el))
LISPC = $(filter-out $(LISPN:%el=%elc),$(LISPF:%el=%elc))
-.PHONY: all compile compile-dirty \
- compile-single compile-source compile-slint1 compile-slint2 \
- autoloads \
- install clean cleanauto cleanall cleanelc clean-install
+.PHONY: all compile compile-dirty compile-single \
+ autoloads \
+ install clean cleanauto cleanall clean-install
# do not clean here, done in toplevel make
-all compile compile-dirty:: autoloads
- $(MAKE) compile-$(_COMPILE_)
-
-compile-dirall:
- @$(ELCDIR)
-compile-single: $(LISPC)
-compile-source: cleanelc
+all compile:: autoloads
+all compile compile-dirty:: $(LISPI) $(LISPV)
+ $(ELCDIR)
+compile-single: clean autoloads $(LISPC)
+compile-source: clean autoloads
@$(foreach elc,$(LISPC),$(MAKE) $(elc) && $(RM) $(elc);)
-compile-slint1: compile-dirall
- @$(foreach elc,$(LISPC),$(RM) $(elc); $(MAKE) $(elc);)
-compile-slint2:
- $(MAKE) compile-source compile-slint1
%.elc: %.el
- @$(info Compiling single $(abspath $<)...)
- -@$(ELC) $<
+ -$(ELC) $(<)
autoloads: cleanauto $(LISPI) $(LISPV)
@@ -53,7 +45,7 @@ install: $(LISPF) compile
cleanauto clean cleanall::
$(RM) $(LISPA) $(LISPA:%el=%elc)
-clean cleanall cleanelc::
+clean cleanall::
$(RM) *.elc
clean-install:
diff --git a/targets.mk b/targets.mk
index a0e47ea..5db69f3 100644
--- a/targets.mk
+++ b/targets.mk
@@ -28,7 +28,7 @@ endif
cleancontrib cleantesting cleanutils
cleanrel clean-install cleanelc cleandirs \
cleanlisp cleandoc cleandocs cleantest \
- compile compile-dirty uncompiled \
+ compile compile-single compile-source compile-dirty uncompiled \
config config-test config-exe config-all config-eol
CONF_BASE = EMACS DESTDIR
@@ -75,7 +75,7 @@ local.mk:
all compile::
$(foreach dir, doc lisp, $(MAKE) -C $(dir) clean;)
-compile compile-dirty::
+compile compile-dirty compile-single compile-source::
$(MAKE) -C lisp $@
all clean-install::
$(foreach dir, $(SUBDIRS), $(MAKE) -C $(dir) $@;)
@@ -118,25 +118,26 @@ clean: cleanrel
$(MAKE) -C lisp clean
$(MAKE) -C doc clean
-cleanall: cleandirs cleantest
+cleanall: cleandirs cleantest cleancontrib cleantesting cleanutils
-$(FIND) . -name \*~ -o -name \*# -o -name .#\* -exec $(RM) {} \;
- -$(FIND) contrib testing UTILITIES -name \*~ -o -name \*.elc -exec $(RM) {} \;
-cleancontrib cleantesting cleanUTILITIES:
- -$(FIND) $(@:clean%=%) -name \*~ -o -name \*.elc -exec $(RM) {} \;
+cleancontrib:
+ -$(FIND) contrib -name \*~ -o -name \*.elc -exec $(RM) {} \;
-cleanutils: cleanUTILITIES
+cleantesting:
+ -$(FIND) testing -name \*~ -o -name \*.elc -exec $(RM) {} \;
+
+cleanutils:
+ -$(FIND) UTILITIES -name \*~ -o -name \*.elc -exec $(RM) {} \;
cleanrel:
$(RMR) RELEASEDIR
$(RMR) org-7.*
$(RMR) org-7*zip org-7*tar.gz
-cleanelc:
- $(MAKE) -C lisp $@
-
-cleanlisp:
+cleanelc cleanlisp:
$(MAKE) -C lisp clean
+ -$(FIND) lisp -name \*~ -exec $(RM) {} \;
cleandoc cleandocs:
$(MAKE) -C doc clean