summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2012-01-05 20:54:52 +0100
committerAchim Gratz <Stromeko@Stromeko.DE>2012-04-20 21:04:12 +0200
commit41624c1809d015a4d41601917ce09234dd8f567b (patch)
treed5a578f4105edd6602c439426cda975e6f42d4b0
parentb9c72bebe424e05e678c267f0c801ea83a226c9d (diff)
downloadorg-mode-41624c1809d015a4d41601917ce09234dd8f567b.tar.gz
ignore *.t2d directories in doc/, adapt some comments, implement missing targets
.gitignore: also ignore *.t2d directories in doc/ that texi2pdf might produce when run in tidy mode default.mk: correct some comments targets.mk: implement missing clean targets and add aliases for them
-rw-r--r--.gitignore4
-rw-r--r--default.mk40
-rw-r--r--targets.mk13
3 files changed, 36 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore
index 3504d1d..609c224 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,10 @@ local*.mk
doc/git-describe.texi
.gitattributes
+# texi2pdf --tidy
+
+doc/*.t2d
+
# aspell word and replacement lists
.aspell.org.pws
diff --git a/default.mk b/default.mk
index 24d48e4..b3c3f6c 100644
--- a/default.mk
+++ b/default.mk
@@ -1,15 +1,17 @@
##----------------------------------------------------------------------
-## YOU MUST EDIT THE FOLLOWING LINES
+## NEVER EDIT THIS FILE, PUT ANY ADAPTATIONS INTO local.mk
+##----------------------------------------------------------------------
+## CHECK AND ADAPT THE FOLLOWING DEFINITIONS
##----------------------------------------------------------------------
# Name of your emacs binary
-EMACS = emacs
+EMACS = emacs
# Where local software is found
-prefix = /usr/share
+prefix = /usr/share
# Where local lisp files go.
-lispdir = $(prefix)/emacs/site-lisp/org
+lispdir= $(prefix)/emacs/site-lisp/org
# Where local data files go.
datadir = $(prefix)/emacs/etc/org
@@ -18,16 +20,17 @@ datadir = $(prefix)/emacs/etc/org
infodir = $(prefix)/info
##----------------------------------------------------------------------
-## YOU MAY NEED TO EDIT THESE
+## YOU MAY NEED TO ADAPT THESE DEFINITIONS
##----------------------------------------------------------------------
# Using emacs in batch mode.
-BATCH = $(EMACS) -batch -Q \
+BATCH = $(EMACS) -batch -Q \
-L . \
--eval '(defconst org-release "$(ORGVERSION)-Make")' \
-# run tests
-BTEST = $(EMACS) -batch \
+# How to run tests
+BTEST_EXTRA = # placeholder
+BTEST = $(EMACS) -batch \
$(BTEST_EXTRA) \
-L lisp/ \
--eval '(defconst org-release "$(ORGVERSION)-Test")' \
@@ -36,20 +39,20 @@ BTEST = $(EMACS) -batch \
-f org-test-run-batch-tests
# How to byte-compile the whole source directory
-ELCDIR = $(BATCH) \
+ELCDIR = $(BATCH) \
--eval '(batch-byte-recompile-directory 0)'
# How to byte-compile a single source file
-ELC = $(BATCH) -f batch-byte-compile
+ELC = $(BATCH) -f batch-byte-compile
# How to make a pdf file from a texinfo file
-TEXI2PDF = texi2pdf
+TEXI2PDF = texi2pdf --batch --clean
# How to make a pdf file from a tex file
PDFTEX = pdftex
# How to create directories
-MKDIR = mkdir -p
+MKDIR = mkdir -p
# How to create the info files from the texinfo file
MAKEINFO = makeinfo
@@ -58,20 +61,21 @@ MAKEINFO = makeinfo
TEXI2HTML = makeinfo --html --number-sections
# How to find files
-FIND = find
+FIND = find
# How to remove files
-RM = rm -f
+RM = rm -f
# How to remove files recursively
-RMR = rm -fr
+RMR = rm -fr
# How to stream edit a file
-SED = sed
+SED = sed
# How to copy the lisp files and elc files to their destination.
-# CP = cp -p # try this if there is no install
-CP = install -p
+# CP = cp -p # try this if there is no install
+CP = install -p
# Name of the program to install info files
+# INSTALL_INFO = ginstall-info # Debian: avoid harmless warning message
INSTALL_INFO = install-info
diff --git a/targets.mk b/targets.mk
index 02d1be0..8b0d9da 100644
--- a/targets.mk
+++ b/targets.mk
@@ -22,7 +22,8 @@ endif
.PHONY: default all up2 update compile lisp doc etc \
test install info html pdf card docs $(INSTSUB) \
- autoloads cleanall clean cleancontrib cleanelc cleandoc cleanrel clean-install
+ autoloads cleanall clean cleancontrib cleanrel clean-install \
+ cleanelc cleanlisp cleandoc cleandocs
all \
compile:: lisp
@@ -46,8 +47,8 @@ up2: update
sudo ${MAKE} install
update:
+ git remote update
git pull
- ${MAKE} clean
${MAKE} all
install: $(INSTSUB)
@@ -62,7 +63,7 @@ info html pdf card:
$(INSTSUB):
$(MAKE) -C $(@:install-%=%) install
-autoloads: lisp maint.mk
+autoloads: lisp
$(MAKE) -C $< $@
cleanall: $(SUBDIRS)
@@ -81,3 +82,9 @@ cleanrel:
$(RMR) RELEASEDIR
$(RMR) org-7.*
$(RMR) org-7*zip org-7*tar.gz
+
+cleanelc cleanlisp:
+ $(MAKE) -C lisp clean
+
+cleandoc cleandocs:
+ $(MAKE) -C doc clean