From 7c3c5d1c8c5c065440bdadb72150813c2e67c2ec Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Mon, 7 Sep 2020 14:42:45 +0100 Subject: [PATCH] @@@ Makefile, Project.mk: Replace the build system. Abolish Autoconf, and the awful `m4' thing. The new build system scrapes most of the information it needs out of the `docstrip' input. @@@ shared files currently hacky symlinks --- .gitignore | 39 +++++++-------------------- Makefile | 1 + Makefile.m4 | 85 ---------------------------------------------------------- Project.mk | 38 ++++++++++++++++++++++++++ configure.in | 34 ----------------------- debian/rules | 7 +++++ update-version | 1 + 7 files changed, 56 insertions(+), 149 deletions(-) create mode 120000 Makefile delete mode 100644 Makefile.m4 create mode 100644 Project.mk delete mode 100644 configure.in create mode 120000 update-version diff --git a/.gitignore b/.gitignore index 52143d7..260fd59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,14 @@ -*.ans -*.aux -*.def +*.[1-9]pt +*.1[0-9]pt +*.cls *.dvi -*.fd -*.idx -*.ilg -*.ind *.log *.lot -*.out -*.ps *.pdf -*.sty -*.thm -*.tmp -*.toc -Makefile -Makefile.am -Makefile.in -aclocal.m4 -config.cache -config.status -configure -strayman.cls -strayman.*pt -strayman.text +*.ps *.tar.gz -COPYING -autom4te.cache -build -gpl.tex -install-sh -missing -auto-version + +/COPYING +/auto-version +/gpl.tex +/strayman.text diff --git a/Makefile b/Makefile new file mode 120000 index 0000000..ac99b27 --- /dev/null +++ b/Makefile @@ -0,0 +1 @@ +/home/mdw/src/mdwtools/Makefile \ No newline at end of file diff --git a/Makefile.m4 b/Makefile.m4 deleted file mode 100644 index bd5238a..0000000 --- a/Makefile.m4 +++ /dev/null @@ -1,85 +0,0 @@ -## -*-m4-*- -## -## Build system for strayman -## -## (c) 2002 Mark Wooding -## - -##----- Licensing notice ---------------------------------------------------- -## -## This file is part of the Straylight Manual LaTeX document class. -## -## strayman is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## strayman is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with strayman; if not, write to the Free Software Foundation, -## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -pkglatexdir = ${texmfdir}/tex/latex/${PACKAGE} -pkgdocdir = ${texmfdir}/doc/latex/${PACKAGE} - -define(`addsuffix', `patsubst(`$1', `\>', `$2')') -define(`BASE', `strayman') - -AUX = gpl.tex strayman.cls -SRC = addsuffix(BASE, `.dtx') -DVI = addsuffix(BASE, `.dvi') -PS = addsuffix(BASE, `.ps') -PDF = addsuffix(BASE, `.pdf') -OBJ = \ - strayman.8pt \ - strayman.9pt \ - strayman.10pt \ - strayman.11pt \ - strayman.12pt \ - strayman.text \ - strayman.cls - -pkglatex_DATA = $(OBJ) -pkgdoc_DATA = $(DVI) $(PS) $(PDF) - -SUFFIXES = .dtx .tex .dvi .ps .pdf -define(`run_latex', `rm -rf t.$`'@/ && mkdir t.$`'@/ && \ - cd t.$`'@/ && \ - TEXINPUTS=..:$$TEXINPUTS && export TEXINPUTS && \ - $1 "\def\indexing{n} \nonstopmode \input $<" && \ - $1 "\def\indexing{y} \nonstopmode \input $<" && \ - makeindex -s gind.ist $`'*.idx && \ - $1 "\def\indexing{n} \nonstopmode \input $<" && \ - mv $`'@ ../ && cd ../ && rm -rf t.$`'@/') - -$(DVI) $(PDF): $(OBJ) $(AUX) -.dtx.dvi:; run_latex(`latex') -.dtx.pdf:; run_latex(`pdflatex') -.dvi.ps:; dvips $< -clean-local::; rm -rf t.*/ - -$(OBJ): $(SRC) strayman.ins - tex strayman.ins - -EXTRA_DIST = $(SRC) $(AUX) $(DVI) $(OBJ) strayman.ins Makefile.m4 - -MAINTAINERCLEANFILES = $(OBJ) $(DVI) -CLEANFILES = *.tmp *.aux *.idx *.ilg *.log *.toc *.ind *.lot *.ans *.ps *.pdf - -dist-hook:: - echo $(VERSION) >$(distdir)/RELEASE -EXTRA_DIST += auto-version - -Makefile.am: Makefile.m4 - cd $(srcdir) && m4 Makefile.m4 >Makefile.am - -.PHONY: dvi - -EXTRA_DIST += debian/changelog debian/control debian/copyright debian/compat -EXTRA_DIST += debian/rules - -##----- That's all, folks --------------------------------------------------- diff --git a/Project.mk b/Project.mk new file mode 100644 index 0000000..46b1a1e --- /dev/null +++ b/Project.mk @@ -0,0 +1,38 @@ +### -*-makefile-gmake-*- +### +### Package-specfic definitions for the build script +### +### (c) 2020 Straylight +### + +###----- Licensing notice --------------------------------------------------- +### +### This file is part of the Straylight Manual LaTeX document class. +### +### `strayman' is free software: you can redistribute it and/or modify it +### under the terms of the GNU General Public License as published by the +### Free Software Foundation; either version 2 of the License, or (at your +### option) any later version. +### +### `strayman' is distributed in the hope that it will be useful, but +### WITHOUT ANY WARRANTY; without even the implied warranty of +### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +### General Public License for more details. +### +### You should have received a copy of the GNU General Public License +### along with `strayman'. If not, write to the Free Software Foundation, +### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +## Package identification. +PACKAGE = strayman + +## Installation files. +INS = strayman.ins + +## Install all of our output files in the LaTeX directory. +pkglatex_FILES += $(OUT) + +## Format the licence text. +EXTRA += gpl.tex + +###----- That's all, folks -------------------------------------------------- diff --git a/configure.in b/configure.in deleted file mode 100644 index 920d904..0000000 --- a/configure.in +++ /dev/null @@ -1,34 +0,0 @@ -dnl -*-autoconf-*- -dnl -dnl Configuration script for strayman -dnl -dnl (c) 2002 Mark Wooding -dnl - -dnl ----- Licensing notice -------------------------------------------------- -dnl -dnl This file is part of the Straylight Manual LaTeX document class. -dnl -dnl strayman is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl strayman is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with strayman; if not, write to the Free Software Foundation, -dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -mdw_AUTO_VERSION -AC_INIT(strayman, AUTO_VERSION, mdw@distorted.org.uk) -AC_CONFIG_SRCDIR(strayman.ins) -AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE(foreign) -mdw_DIR_TEXMF -AC_OUTPUT(Makefile) - -dnl ----- That's all, folks ------------------------------------------------- diff --git a/debian/rules b/debian/rules index 0cff7b4..a5c01f3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,3 +1,10 @@ #! /usr/bin/make -f %:; dh $@ --with tex + +override_dh_auto_install: + dh_auto_install -- texmfdir=/usr/share/texmf + +override_dh_clean: + dh_clean + rm -f *.dvi *.ps *.pdf *.cls *.text *.*pt diff --git a/update-version b/update-version new file mode 120000 index 0000000..db45344 --- /dev/null +++ b/update-version @@ -0,0 +1 @@ +/home/mdw/src/mdwtools/update-version \ No newline at end of file -- 2.11.0