diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/utils/vlna/Makefile.am | 39 | ||||
| -rw-r--r-- | Build/source/utils/vlna/Makefile.in | 68 | ||||
| -rw-r--r-- | Build/source/utils/vlna/Makefile.orig | 53 | ||||
| -rwxr-xr-x | Build/source/utils/vlna/configure | 82 | ||||
| -rw-r--r-- | Build/source/utils/vlna/configure.ac | 12 | ||||
| -rwxr-xr-x | Build/source/utils/vlna/vlna.exe | bin | 13666 -> 0 bytes | |||
| -rw-r--r-- | Build/source/utils/vlna/vlna.man | 9 |
7 files changed, 69 insertions, 194 deletions
diff --git a/Build/source/utils/vlna/Makefile.am b/Build/source/utils/vlna/Makefile.am index b0b8665a9e5..129680ec1bb 100644 --- a/Build/source/utils/vlna/Makefile.am +++ b/Build/source/utils/vlna/Makefile.am @@ -1,53 +1,26 @@ # Makefile.am -- Peter Breitenlohner <peb@mppmu.mpg.de> -- Public domain. bin_PROGRAMS = vlna - -MAN_DEP = -if MAINTAINER_MODE -# Ensure vlna.dvi is up to date -MAN_DEP += $(CWEB_DVI) -endif - -nodist_man1_MANS = vlna.1 - -MAN_SRC = vlna.man - -DOCS = Makefile.orig README README.en vlna.txt +dist_man1_MANS = vlna.man CWEB_SRC = vlna.w - CWEB_TEX = vlna.tex csmac.tex - CWEB_DVI = vlna.dvi -CWEB_EXE = vlna.exe +DOCS = README README.en vlna.txt -EXTRA_DIST = $(DOCS) $(MAN_SRC) $(CWEB_SRC) $(CWEB_TEX) $(CWEB_DVI) $(CWEB_EXE) +EXTRA_DIST = $(CWEB_SRC) $(CWEB_TEX) $(CWEB_DVI) $(DOCS) TMP_FILES = vlna.idx vlna.scn -if TETEX_BUILD -BIN_DIR = BINDIR -MAN_DIR = MANDIR/man1 -else -BIN_DIR = $(bindir) -MAN_DIR = $(man1dir) -endif - -vlna.1: vlna.man $(MAN_DEP) - sed -e "s|@BINDIR@|$(BIN_DIR)|;\ - s|@MANDIR@|$(MAN_DIR)|;\ - s|@MANEXT@|1|" $< > $@ - if MAINTAINER_MODE - +all-local: vlna.dvi vlna.c: vlna.w $(CTANGLE) $< - vlna.tex: vlna.w $(CWEAVE) $< && rm -f $(TMP_FILES) - vlna.dvi: vlna.tex TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(CSPLAIN) vlna.tex - +else +all-local: endif diff --git a/Build/source/utils/vlna/Makefile.in b/Build/source/utils/vlna/Makefile.in index e51a0dee4db..7b49294fff5 100644 --- a/Build/source/utils/vlna/Makefile.in +++ b/Build/source/utils/vlna/Makefile.in @@ -33,12 +33,10 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = vlna$(EXEEXT) -# Ensure vlna.dvi is up to date -@MAINTAINER_MODE_TRUE@am__append_1 = $(CWEB_DVI) subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure ChangeLog \ - depcomp install-sh missing +DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/configure ChangeLog depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -64,7 +62,7 @@ SOURCES = vlna.c DIST_SOURCES = vlna.c man1dir = $(mandir)/man1 NROFF = nroff -MANS = $(nodist_man1_MANS) +MANS = $(dist_man1_MANS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -164,20 +162,13 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -MAN_DEP = $(am__append_1) -nodist_man1_MANS = vlna.1 -MAN_SRC = vlna.man -DOCS = Makefile.orig README README.en vlna.txt +dist_man1_MANS = vlna.man CWEB_SRC = vlna.w CWEB_TEX = vlna.tex csmac.tex CWEB_DVI = vlna.dvi -CWEB_EXE = vlna.exe -EXTRA_DIST = $(DOCS) $(MAN_SRC) $(CWEB_SRC) $(CWEB_TEX) $(CWEB_DVI) $(CWEB_EXE) +DOCS = README README.en vlna.txt +EXTRA_DIST = $(CWEB_SRC) $(CWEB_TEX) $(CWEB_DVI) $(DOCS) TMP_FILES = vlna.idx vlna.scn -@TETEX_BUILD_FALSE@BIN_DIR = $(bindir) -@TETEX_BUILD_TRUE@BIN_DIR = BINDIR -@TETEX_BUILD_FALSE@MAN_DIR = $(man1dir) -@TETEX_BUILD_TRUE@MAN_DIR = MANDIR/man1 all: all-am .SUFFIXES: @@ -263,10 +254,10 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -install-man1: $(nodist_man1_MANS) +install-man1: $(dist_man1_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(nodist_man1_MANS)'; \ + @list='$(dist_man1_MANS)'; \ for i in $$list; do \ if test -f $$i; then file=$$i; \ else file=$(srcdir)/$$i; fi; \ @@ -283,7 +274,7 @@ install-man1: $(nodist_man1_MANS) done uninstall-man1: @$(NORMAL_UNINSTALL) - @list='$(nodist_man1_MANS)'; \ + @list='$(dist_man1_MANS)'; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ case "$$ext" in \ @@ -477,7 +468,7 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(MANS) +all-am: Makefile $(PROGRAMS) $(MANS) all-local installdirs: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -570,36 +561,31 @@ uninstall-man: uninstall-man1 .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-compile distclean-generic distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ +.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \ + clean clean-binPROGRAMS clean-generic ctags dist dist-all \ + dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-man uninstall-man1 -vlna.1: vlna.man $(MAN_DEP) - sed -e "s|@BINDIR@|$(BIN_DIR)|;\ - s|@MANDIR@|$(MAN_DIR)|;\ - s|@MANEXT@|1|" $< > $@ - +@MAINTAINER_MODE_TRUE@all-local: vlna.dvi @MAINTAINER_MODE_TRUE@vlna.c: vlna.w @MAINTAINER_MODE_TRUE@ $(CTANGLE) $< - @MAINTAINER_MODE_TRUE@vlna.tex: vlna.w @MAINTAINER_MODE_TRUE@ $(CWEAVE) $< && rm -f $(TMP_FILES) - @MAINTAINER_MODE_TRUE@vlna.dvi: vlna.tex @MAINTAINER_MODE_TRUE@ TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(CSPLAIN) vlna.tex +@MAINTAINER_MODE_FALSE@all-local: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/utils/vlna/Makefile.orig b/Build/source/utils/vlna/Makefile.orig deleted file mode 100644 index 4b6c40e0c4a..00000000000 --- a/Build/source/utils/vlna/Makefile.orig +++ /dev/null @@ -1,53 +0,0 @@ - -DESTDIR=/usr/local -MANEXT=1 -BINDIR=$(DESTDIR)/bin -MANDIR=$(DESTDIR)/man/man$(MANEXT) - -CC=cc -INSTALL=install -MKDIR=mkdir -p -INSTPROGFLAGS=-s -m755 -INSTDATAFLAGS=-m644 - -CFLAGS=-O -LFLAGS= - -CTANGLE=ctangle -CWEAVE=cweave -TEX=csplain - -all: vlna - -vlna: vlna.c - $(CC) $(CFLAGS) $(LFLAGS) $? -o $@ - -install: all install.man - @if [ -d $(BINDIR) ]; then \ - set +x; else (set -x; $(MKDIR) $(BINDIR)); fi - $(INSTALL) $(INSTPROGFLAGS) vlna $(BINDIR)/vlna - -install.man: - sed -e "s|@BINDIR@|$(BINDIR)|;\ - s|@MANDIR@|$(MANDIR)|;\ - s|@MANEXT@|$(MANEXT)|" vlna.man > vlna.$(MANEXT) - @if [ -d $(MANDIR) ]; then \ - set +x; else (set -x; $(MKDIR) $(MANDIR)); fi - $(INSTALL) $(INSTDATAFLAGS) vlna.$(MANEXT) $(MANDIR)/vlna.$(MANEXT) - -vlna.c: vlna.w - $(CTANGLE) $? - $@ - -vlna.tex: vlna.w - $(CWEAVE) $? - $@ - -vlna.dvi: vlna.tex - $(TEX) $? - -clean: - rm -f *.o *~ *.bak core a.out vlna vlna.$(MANEXT) - rm -f vlna.idx vlna.scn vlna.toc vlna.log vlna.tex - -cleanall: clean - rm -f vlna.c vlna.dvi - diff --git a/Build/source/utils/vlna/configure b/Build/source/utils/vlna/configure index 7b82608e0b1..fa196dd60eb 100755 --- a/Build/source/utils/vlna/configure +++ b/Build/source/utils/vlna/configure @@ -601,7 +601,6 @@ PACKAGE_STRING='vlna 1.3' PACKAGE_BUGREPORT='tex-live@tug.org' ac_unique_file="vlna.w" -enable_option_checking=no ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME @@ -662,9 +661,6 @@ am__leading_dot AMTAR am__tar am__untar -MAINTAINER_MODE_TRUE -MAINTAINER_MODE_FALSE -MAINT CC CFLAGS LDFLAGS @@ -684,15 +680,16 @@ am__fastdepCC_FALSE CTANGLE CWEAVE CSPLAIN -TETEX_BUILD_TRUE -TETEX_BUILD_FALSE +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT LIBOBJS LTLIBOBJS' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_dependency_tracking +enable_maintainer_mode ' ac_precious_vars='build_alias host_alias @@ -1328,10 +1325,10 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer Some influential environment variables: CC C compiler command @@ -2275,29 +2272,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - - # Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3655,24 +3629,37 @@ done test -n "$CSPLAIN" || CSPLAIN="none" -if test x"$USE_MAINTAINER_MODE" = xyes; then +if test x"$enable_maintainer_mode" = xyes; then case :$CTANGLE:$CWEAVE:$CSPLAIN: in *:none:*) - { { $as_echo "$as_me:$LINENO: error: Maintainer mode requires ctangle, cweave, and csplain in your PATH." >&5 -$as_echo "$as_me: error: Maintainer mode requires ctangle, cweave, and csplain in your PATH." >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:$LINENO: WARNING: Maintainer mode disabled -- requires ctangle, cweave, and csplain." >&5 +$as_echo "$as_me: WARNING: Maintainer mode disabled -- requires ctangle, cweave, and csplain." >&2;} + enable_maintainer_mode=no ;; esac fi - if test x"$enable_tetex_build" = xyes; then - TETEX_BUILD_TRUE= - TETEX_BUILD_FALSE='#' +{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' else - TETEX_BUILD_TRUE='#' - TETEX_BUILD_FALSE= + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= fi + MAINT=$MAINTAINER_MODE_TRUE + ac_config_files="$ac_config_files Makefile" @@ -3809,13 +3796,6 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -3830,10 +3810,10 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${TETEX_BUILD_TRUE}" && test -z "${TETEX_BUILD_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"TETEX_BUILD\" was never defined. +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"TETEX_BUILD\" was never defined. +$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi diff --git a/Build/source/utils/vlna/configure.ac b/Build/source/utils/vlna/configure.ac index a00c07c9dfe..750d233936d 100644 --- a/Build/source/utils/vlna/configure.ac +++ b/Build/source/utils/vlna/configure.ac @@ -1,14 +1,11 @@ dnl configure.ac -- Peter Breitenlohner <peb@mppmu.mpg.de> -- Public domain. -AC_PREREQ(2.62) +AC_PREREQ(2.60) AC_INIT([vlna], [1.3], [tex-live@tug.org]) AC_CONFIG_SRCDIR([vlna.w]) AM_INIT_AUTOMAKE([foreign no-define])dnl using automake -AM_MAINTAINER_MODE[]dnl maintainer mode only if requested -AC_DISABLE_OPTION_CHECKING[]dnl disable warning for unrecognized inherited options - # Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET @@ -19,15 +16,16 @@ AC_CHECK_PROGS([CTANGLE], [ctangle], [none]) AC_CHECK_PROGS([CWEAVE], [cweave], [none]) AC_CHECK_PROGS([CSPLAIN], [csplain], [none]) -if test x"$USE_MAINTAINER_MODE" = xyes; then +if test x"$enable_maintainer_mode" = xyes; then case :$CTANGLE:$CWEAVE:$CSPLAIN: in *:none:*) - AC_MSG_ERROR([Maintainer mode requires ctangle, cweave, and csplain in your PATH.]) + AC_MSG_WARN([Maintainer mode disabled -- requires ctangle, cweave, and csplain.]) + enable_maintainer_mode=no ;; esac fi -AM_CONDITIONAL([TETEX_BUILD], [test x"$enable_tetex_build" = xyes]) +AM_MAINTAINER_MODE[]dnl maintainer mode only if requested AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/Build/source/utils/vlna/vlna.exe b/Build/source/utils/vlna/vlna.exe Binary files differdeleted file mode 100755 index b096673d835..00000000000 --- a/Build/source/utils/vlna/vlna.exe +++ /dev/null diff --git a/Build/source/utils/vlna/vlna.man b/Build/source/utils/vlna/vlna.man index 0470461370a..c132823f40c 100644 --- a/Build/source/utils/vlna/vlna.man +++ b/Build/source/utils/vlna/vlna.man @@ -117,14 +117,5 @@ Vlnkovani vsech souboru s priponou \fBtex\fP. .B vlna \-f soubor > /dev/null Test konzistence matematickeho a verbatim rezimu bez provedeni zmen. (Pouze na UNIXu.) -.SH SOUBORY -.PD 0 -.TP -.I @BINDIR@/vlna -spustitelny program -.TP -.I @MANDIR@/vlna.@MANEXT@ -manualova stranka -.PD .SH AUTOR Petr Olsak <olsak@math.feld.cvut.cz>. Manualovou stranku a Makefile vytvoril Rulolf Cejka |