Commit 0acfedd3 authored by Stefan Monnier's avatar Stefan Monnier

Try to reduce redundancy in doc/misc/Makefile.in.

* configure.ac (DOCMISC_W32): New var to replace DOCMISC_*_W32.
* doc/misc/Makefile.in (DOCMISC_W32): New var to replace DOCMISC_*_W32.
(TARGETS): New intermediate variable.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS): Use it.
parent 95888bca
2013-08-28 Stefan Monnier <monnier@iro.umontreal.ca>
* configure.ac (DOCMISC_W32): New var to replace DOCMISC_*_W32.
2013-08-27 Paul Eggert <eggert@cs.ucla.edu>
Simplify EMACS_TIME-related code.
......
......@@ -998,23 +998,11 @@ AC_SUBST(INFO_EXT)
AC_SUBST(INFO_OPTS)
if test $opsys = mingw32; then
DOCMISC_DVI_W32=efaq-w32.dvi
DOCMISC_HTML_W32=efaq-w32.html
DOCMISC_INFO_W32=efaq-w32
DOCMISC_PDF_W32=efaq-w32.pdf
DOCMISC_PS_W32=efaq-w32.ps
DOCMISC_W32=efaq-w32
else
DOCMISC_DVI_W32=
DOCMISC_HTML_W32=
DOCMISC_INFO_W32=
DOCMISC_PDF_W32=
DOCMISC_PS_W32=
fi
AC_SUBST(DOCMISC_DVI_W32)
AC_SUBST(DOCMISC_HTML_W32)
AC_SUBST(DOCMISC_INFO_W32)
AC_SUBST(DOCMISC_PDF_W32)
AC_SUBST(DOCMISC_PS_W32)
DOCMISC_W32=
fi
AC_SUBST(DOCMISC_W32)
dnl Add our options to ac_link now, after it is set up.
......
2013-08-28 Stefan Monnier <monnier@iro.umontreal.ca>
Try to reduce redundancy in doc/misc/Makefile.in.
* Makefile.in (DOCMISC_W32): New var to replace DOCMISC_*_W32.
(TARGETS): New intermediate variable.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS): Use it.
2013-08-27 Glenn Morris <rgm@gnu.org>
* efaq.texi (Emacs for MS-Windows): Update location of MS FAQ.
......
......@@ -60,11 +60,7 @@ MAKEINFO = @MAKEINFO@
MAKEINFO_OPTS = --force -I$(emacsdir)
## On MS Windows, efaq-w32; otherwise blank.
DOCMISC_DVI_W32 = @DOCMISC_DVI_W32@
DOCMISC_HTML_W32 = @DOCMISC_HTML_W32@
DOCMISC_INFO_W32 = @DOCMISC_INFO_W32@
DOCMISC_PDF_W32 = @DOCMISC_PDF_W32@
DOCMISC_PS_W32 = @DOCMISC_PS_W32@
DOCMISC_W32 = @DOCMISC_W32@
## Info files to build and install on all platforms.
INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
......@@ -84,237 +80,15 @@ INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_INFO_W32)
## because the info files are pre-built in release tarfiles.
INFO_TARGETS = $(INFO_COMMON) efaq-w32
DVI_TARGETS = $(DOCMISC_DVI_W32) \
ada-mode.dvi \
auth.dvi \
autotype.dvi \
bovine.dvi \
calc.dvi \
cc-mode.dvi \
cl.dvi \
dbus.dvi \
dired-x.dvi \
ebrowse.dvi \
ede.dvi \
ediff.dvi \
edt.dvi \
efaq.dvi \
eieio.dvi \
emacs-mime.dvi \
epa.dvi \
erc.dvi \
ert.dvi \
eshell.dvi \
eudc.dvi \
flymake.dvi \
forms.dvi \
gnus.dvi \
emacs-gnutls.dvi \
htmlfontify.dvi \
idlwave.dvi \
ido.dvi \
info.dvi \
mairix-el.dvi \
message.dvi \
mh-e.dvi \
newsticker.dvi \
nxml-mode.dvi \
org.dvi \
pcl-cvs.dvi \
pgg.dvi \
rcirc.dvi \
reftex.dvi \
remember.dvi \
sasl.dvi \
sc.dvi \
semantic.dvi \
ses.dvi \
sieve.dvi \
smtpmail.dvi \
speedbar.dvi \
srecode.dvi \
todo-mode.dvi \
tramp.dvi \
url.dvi \
vip.dvi \
viper.dvi \
widget.dvi \
wisent.dvi \
woman.dvi
HTML_TARGETS = $(DOCMISC_HTML_W32) \
ada-mode.html \
auth.html \
autotype.html \
bovine.html \
calc.html \
cc-mode.html \
cl.html \
dbus.html \
dired-x.html \
ebrowse.html \
ede.html \
ediff.html \
edt.html \
efaq.html \
eieio.html \
emacs-mime.html \
epa.html \
erc.html \
ert.html \
eshell.html \
eudc.html \
flymake.html \
forms.html \
gnus.html \
emacs-gnutls.html \
htmlfontify.html \
idlwave.html \
ido.html \
info.html \
mairix-el.html \
message.html \
mh-e.html \
newsticker.html \
nxml-mode.html \
org.html \
pcl-cvs.html \
pgg.html \
rcirc.html \
reftex.html \
remember.html \
sasl.html \
sc.html \
semantic.html \
ses.html \
sieve.html \
smtpmail.html \
speedbar.html \
srecode.html \
todo-mode.html \
tramp.html \
url.html \
vip.html \
viper.html \
widget.html \
wisent.html \
woman.html
PDF_TARGETS = $(DOCMISC_PDF_W32) \
ada-mode.pdf \
auth.pdf \
autotype.pdf \
bovine.pdf \
calc.pdf \
cc-mode.pdf \
cl.pdf \
dbus.pdf \
dired-x.pdf \
ebrowse.pdf \
ede.pdf \
ediff.pdf \
edt.pdf \
efaq.pdf \
eieio.pdf \
emacs-mime.pdf \
epa.pdf \
erc.pdf \
ert.pdf \
eshell.pdf \
eudc.pdf \
flymake.pdf \
forms.pdf \
gnus.pdf \
htmlfontify.pdf \
emacs-gnutls.pdf \
idlwave.pdf \
ido.pdf \
info.pdf \
mairix-el.pdf \
message.pdf \
mh-e.pdf \
newsticker.pdf \
nxml-mode.pdf \
org.pdf \
pcl-cvs.pdf \
pgg.pdf \
rcirc.pdf \
reftex.pdf \
remember.pdf \
sasl.pdf \
sc.pdf \
semantic.pdf \
ses.pdf \
sieve.pdf \
smtpmail.pdf \
speedbar.pdf \
srecode.pdf \
todo-mode.pdf \
tramp.pdf \
url.pdf \
vip.pdf \
viper.pdf \
widget.pdf \
wisent.pdf \
woman.pdf
PS_TARGETS = $(DOCMISC_PS_W32) \
ada-mode.ps \
auth.ps \
autotype.ps \
bovine.ps \
calc.ps \
cc-mode.ps \
cl.ps \
dbus.ps \
dired-x.ps \
ebrowse.ps \
ede.ps \
ediff.ps \
edt.ps \
efaq.ps \
eieio.ps \
emacs-mime.ps \
epa.ps \
erc.ps \
ert.ps \
eshell.ps \
eudc.ps \
flymake.ps \
forms.ps \
gnus.ps \
htmlfontify.ps \
emacs-gnutls.ps \
idlwave.ps \
ido.ps \
info.ps \
mairix-el.ps \
message.ps \
mh-e.ps \
newsticker.ps \
nxml-mode.ps \
org.ps \
pcl-cvs.ps \
pgg.ps \
rcirc.ps \
reftex.ps \
remember.ps \
sasl.ps \
sc.ps \
semantic.ps \
ses.ps \
sieve.ps \
smtpmail.ps \
speedbar.ps \
srecode.ps \
todo-mode.ps \
tramp.ps \
url.ps \
vip.ps \
viper.ps \
widget.ps \
wisent.ps \
woman.ps
# There are some naming differences between the info targets and the other
# targets, so let's resolve them here.
TARGETS_1 = $(INFO_INSTALL:ccmode=cc-mode)
TARGETS = $(TARGETS_1:info.info=info)
DVI_TARGETS = $(TARGETS:=.dvi)
HTML_TARGETS = $(TARGETS:=.html)
PDF_TARGETS = $(TARGETS:=.pdf)
PS_TARGETS = $(TARGETS:=.ps)
TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment