Hi all,
>>>>> Ikumi Keita <ik...@ikumi.que.jp> writes:
> I noticed some minor issues about Makefiles of AUCTeX.
> (A) Makefile in latex/ subdirectory
> (B) Clean targets in Makefiles
> I think that it is straightforward to sort out (B), but (A) is not so
> trivial. What do you think about them?
I made two patches for (A) and (B). I think it's OK to apply (B), so
will install in the git repo. Does anyone have objection to (A), which
effectively phases out dvi format and uses pdf instead of it?
Regards,
Ikumi Keita
diff --git a/Makefile.in b/Makefile.in
index 666b686f..c0ab5294 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
# Maintainer: auctex-devel@gnu.org
-# Copyright (C) 2003-2008, 2010, 2013-2015, 2018 Free Software
+# Copyright (C) 2003-2008, 2010, 2013-2015, 2018-2019 Free Software
# Foundation, Inc.
# This file is part of AUCTeX.
@@ -360,19 +360,23 @@ uninstall:
.el.elc:
$(ELCC) -f batch-byte-compile $<
-clean: doc/Makefile
+clean: doc/Makefile latex/Makefile
rm -f $(CLEANFILES)
cd doc && $(MAKE) clean
+ cd latex && $(MAKE) clean
-distclean: doc/Makefile
+distclean: doc/Makefile latex/Makefile
rm -f $(CLEANFILES) $(DISTCLEANFILES)
cd doc && $(MAKE) distclean
+ cd latex && $(MAKE) distclean
-maintainer-clean: doc/Makefile
+maintainer-clean: doc/Makefile latex/Makefile
rm -f $(DISTTEXTS)
rm -rf autom4te.cache
rm -f $(CLEANFILES) $(DISTCLEANFILES)
cd doc && $(MAKE) maintainer-clean
+ cd latex && $(MAKE) distclean
+ cd tests && $(MAKE) clean
extraclean: maintainer-clean
rm -f *~ \#*\#
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6f40d825..21cc2e91 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -2,7 +2,7 @@
# Maintainer: auctex-devel@gnu.org
-# Copyright (C) 2003-2008, 2013-2015, 2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008, 2013-2015, 2018-2019 Free Software Foundation, Inc.
# This file is part of AUCTeX.
@@ -208,5 +208,4 @@ distclean: clean
rm -f Makefile
maintainer-clean: distclean
- rm -f INSTALL.windows README CHANGES HISTORY TODO FAQ \
- preview-dtxdoc.texi version.texi $(DISTTEXTS) *.info *.info-*
+ rm -f preview-dtxdoc.texi version.texi $(DISTTEXTS) *.info *.info-*
diff --git a/latex/Makefile.in b/latex/Makefile.in
index afb0a62a..f342b6bc 100644
--- a/latex/Makefile.in
+++ b/latex/Makefile.in
@@ -2,7 +2,7 @@
# Maintainer: auctex-devel@gnu.org
-# Copyright (C) 2002-2006, 2008, 2014, 2015 Free Software Foundation,
+# Copyright (C) 2002-2006, 2008, 2014, 2015, 2019 Free Software Foundation,
# Inc.
# This file is part of AUCTeX.
@@ -42,7 +42,7 @@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = ../mkinstalldirs
-.PHONY: all install install-texmf install-texmf-doc uninstall clean
+.PHONY: all install install-texmf install-texmf-doc uninstall clean distclean
all: $(TEXMFGEN) preview.drv preview-mk.ins preview.dvi preview.pdf
@@ -93,5 +93,8 @@ preview.pdf: preview.drv preview.dtx preview.sty
$(PDFLATEX) '\nonstopmode \AtBeginDocument{\OnlyDescription}\input{preview.drv}'
clean:
- rm -f *~ *.aux *.dvi *.drv *.log
+ rm -f *~ *.aux *.dvi *.drv *.log preview.pdf
rm -f $(TEXMFGEN) preview.ins preview-mk.ins
+
+distclean: clean
+ rm -f Makefile
diff --git a/latex/Makefile.in b/latex/Makefile.in
index f342b6bc..ab636475 100644
--- a/latex/Makefile.in
+++ b/latex/Makefile.in
@@ -44,7 +44,7 @@ MKINSTALLDIRS = ../mkinstalldirs
.PHONY: all install install-texmf install-texmf-doc uninstall clean distclean
-all: $(TEXMFGEN) preview.drv preview-mk.ins preview.dvi preview.pdf
+all: $(TEXMFGEN) preview.drv preview-mk.ins preview.pdf
install: install-texmf install-texmf-doc
@@ -63,12 +63,12 @@ install-texmf: $(TEXMFGEN)
sleep 2; \
fi
-install-texmf-doc: preview.dvi
+install-texmf-doc: preview.pdf
$(MKINSTALLDIRS) $(DESTDIR)$(previewdocdir)
- $(INSTALL_DATA) preview.dvi $(DESTDIR)$(previewdocdir)
+ $(INSTALL_DATA) preview.pdf $(DESTDIR)$(previewdocdir)
uninstall:
- rm -rf $(DESTDIR)$(previewdocdir)/preview.dvi $(DESTDIR)$(previewtexmfdir)
+ rm -rf $(DESTDIR)$(previewdocdir)/preview.dvi $(DESTDIR)$(previewdocdir)/preview.pdf $(DESTDIR)$(previewtexmfdir)
preview-mk.ins: preview.dtx bootstrap.ins
$(TEX) '\nonstopmode \input bootstrap.ins'
@@ -88,9 +88,9 @@ preview.dvi: preview.drv preview.dtx preview.sty
$(LATEX) '\nonstopmode \input preview.drv'
preview.pdf: preview.drv preview.dtx preview.sty
- $(PDFLATEX) '\nonstopmode \AtBeginDocument{\OnlyDescription}\input{preview.drv}'
- $(PDFLATEX) '\nonstopmode \AtBeginDocument{\OnlyDescription}\input{preview.drv}'
- $(PDFLATEX) '\nonstopmode \AtBeginDocument{\OnlyDescription}\input{preview.drv}'
+ $(PDFLATEX) '\nonstopmode \input{preview.drv}'
+ $(PDFLATEX) '\nonstopmode \input{preview.drv}'
+ $(PDFLATEX) '\nonstopmode \input{preview.drv}'
clean:
rm -f *~ *.aux *.dvi *.drv *.log preview.pdf
