Commit bfd1626c authored by Olaf Meeuwissen's avatar Olaf Meeuwissen

Sync autofoo

parent 8598f81d
Pipeline #3702480 passed with stage
in 8 minutes and 17 seconds
......@@ -268,9 +268,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
......@@ -1787,9 +1787,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
......@@ -649,7 +649,7 @@ WITH_API_PS_TRUE
PPMTOGIF
DLH
GS
EPSTOPDF
FIG2DEV
PDFLATEX
LATEX
DVIPS
......@@ -21131,16 +21131,16 @@ $as_echo "no" >&6; }
fi
# Extract the first word of "epstopdf", so it can be a program name with args.
set dummy epstopdf; ac_word=$2
# Extract the first word of "fig2dev", so it can be a program name with args.
set dummy fig2dev; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_EPSTOPDF+:} false; then :
if ${ac_cv_path_FIG2DEV+:} false; then :
$as_echo_n "(cached) " >&6
else
case $EPSTOPDF in
case $FIG2DEV in
[\\/]* | ?:[\\/]*)
ac_cv_path_EPSTOPDF="$EPSTOPDF" # Let the user override the test with a path.
ac_cv_path_FIG2DEV="$FIG2DEV" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
......@@ -21150,7 +21150,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_EPSTOPDF="$as_dir/$ac_word$ac_exec_ext"
ac_cv_path_FIG2DEV="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
......@@ -21158,14 +21158,14 @@ done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_EPSTOPDF" && ac_cv_path_EPSTOPDF="no"
test -z "$ac_cv_path_FIG2DEV" && ac_cv_path_FIG2DEV="no"
;;
esac
fi
EPSTOPDF=$ac_cv_path_EPSTOPDF
if test -n "$EPSTOPDF"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPSTOPDF" >&5
$as_echo "$EPSTOPDF" >&6; }
FIG2DEV=$ac_cv_path_FIG2DEV
if test -n "$FIG2DEV"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIG2DEV" >&5
$as_echo "$FIG2DEV" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
......@@ -21298,12 +21298,13 @@ fi
if test xno != "x$with_api_spec"; then :
if test xno != "x$MAKEINDEX" \
&& test xno != "x$DVIPS" \
&& test xno != "x$FIG2DEV" \
&& test xno != "x$LATEX"; then :
with_api_ps=yes
fi
if test xno != "x$MAKEINDEX" \
&& test xno != "x$PDFLATEX" \
&& test xno != "x$EPSTOPDF" \
&& test xno != "x$FIG2DEV" \
&& test xno != "x$GS"; then :
with_api_pdf=yes
fi
......
......@@ -198,9 +198,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......@@ -526,10 +526,12 @@ DESC_EXT_FILES = descriptions-external/brother2.desc \
API_SPECS = $(am__append_1) $(am__append_2) $(am__append_3)
API_SPEC_INPUTS = $(srcdir)/sane.tex $(srcdir)/net.tex \
$(srcdir)/html.sty
API_SPEC_TEX_FIGS = figs/area.fig figs/area.eps figs/flow.fig \
figs/flow.eps figs/hierarchy.fig figs/hierarchy.eps \
figs/image-data.fig figs/image-data.eps figs/xfer.fig \
figs/xfer.eps
API_SPEC_TEX_FIGS = figs/area.fig figs/flow.fig figs/hierarchy.fig \
figs/image-data.fig figs/xfer.fig
API_SPEC_EPS_FIGS = figs/area.eps figs/flow.eps figs/hierarchy.eps \
figs/image-data.eps figs/xfer.eps
API_SPEC_PDF_FIGS = figs/area.pdf figs/flow.pdf figs/hierarchy.pdf \
figs/image-data.pdf figs/xfer.pdf
API_SPEC_HTML_ICONS = icons/contents.gif icons/index.gif \
icons/next.gif icons/next_gr.gif icons/previous.gif \
icons/previous_gr.gif icons/references.gif \
......@@ -538,6 +540,7 @@ am_TEXINPUTS = TEXINPUTS="$(builddir):$(srcdir):$$TEXINPUTS"
all: all-am
.SUFFIXES:
.SUFFIXES: .eps .fig .pdf
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
......@@ -966,7 +969,11 @@ sane.ind: $(API_SPEC_INPUTS)
$(MAKEINDEX) -q sane.idx && \
$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
sane.dvi: $(API_SPEC_INPUTS) sane.ind
.fig.eps:
@test -d $(@D) || $(MKDIR_P) $(@D)
$(FIG2DEV) -L eps $< $@
sane.dvi: $(API_SPEC_INPUTS) $(API_SPEC_EPS_FIGS) sane.ind
@echo Generating $@ from $<...
@$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
......@@ -974,12 +981,12 @@ sane.ps: sane.dvi
@echo Generating $@ from $<...
@$(am_TEXINPUTS) $(DVIPS) -q $< -o $@
sane.pdf: $(API_SPEC_INPUTS) sane.ind
.fig.pdf:
@test -d $(@D) || $(MKDIR_P) $(@D)
$(FIG2DEV) -L pdf $< $@
sane.pdf: $(API_SPEC_INPUTS) $(API_SPEC_PDF_FIGS) sane.ind
@echo Generating $@ from $<...
@if test $(srcdir) != $(builddir); then \
test -d $(builddir)/figs || mkdir -p $(builddir)/figs; \
cp $(srcdir)/figs/*.eps $(builddir)/figs; \
fi
@$(am_TEXINPUTS) $(PDFLATEX) $< >/dev/null
sane-html: sane.dvi
......@@ -1036,9 +1043,10 @@ html-local: html-pages html-man sane-html
clean-local:
rm -f *.toc *.aux *.log *.cp *.fn *.tp *.vr *.pg *.ky *.blg *.idx *.cb
rm -f *.ilg
rm -f $(API_SPEC_EPS_FIGS) $(API_SPEC_PDF_FIGS)
-rmdir figs
distclean-local:
test $(srcdir) = $(builddir) || rm -fr $(builddir)/figs
rm -f $(MANPAGES)
rm -f *.lot *.lof *.ind
rm -f sane.dvi sane.ps sane-backends.html sane-backends-external.html
......
......@@ -226,9 +226,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
......@@ -204,9 +204,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
......@@ -248,9 +248,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
......@@ -209,9 +209,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
......@@ -221,9 +221,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
......@@ -216,9 +216,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
......@@ -433,9 +433,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
......@@ -156,9 +156,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
......@@ -263,9 +263,9 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EPSTOPDF = @EPSTOPDF@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIG2DEV = @FIG2DEV@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
......
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