The default behavior of "make everything" is now to build separate
guides rather than the big one. Determines the name of the installed docbook filter (db2html or docbook2html, etc.) in configure, defaulting to false if absent.
This commit is contained in:
Vincent Béron
Alexandre Julliard
parent
43a0a51540
commit
1d8cb6efd2
|
|
@ -305,7 +305,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBEXT OPTIONS WIN16_FILES WIN16_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP TOOLSDIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS YACC LEX LEXLIB LEX_OUTPUT_ROOT XYACC XLEX LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S LN C2MAN LDCONFIG LINT LINTFLAGS JPEGLIB EGREP XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ft_devel ft_devel2 FREETYPEINCL ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS DLLEXT DLLFLAGS DLLIBS LDDLLFLAGS LDSHARED DLLWRAP ac_ct_DLLWRAP CROSSTEST CROSSCC DLLTOOL LDPATH CRTLIBS LDD ALLOCA LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBEXT OPTIONS WIN16_FILES WIN16_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP TOOLSDIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS YACC LEX LEXLIB LEX_OUTPUT_ROOT XYACC XLEX LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S LN C2MAN LDCONFIG LINT LINTFLAGS DB2HTML DB2PDF DB2PS JPEGLIB EGREP XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ft_devel ft_devel2 FREETYPEINCL ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS DLLEXT DLLFLAGS DLLIBS LDDLLFLAGS LDSHARED DLLWRAP ac_ct_DLLWRAP CROSSTEST CROSSCC DLLTOOL LDPATH CRTLIBS LDD ALLOCA LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_TEST_RULES MAKE_PROG_RULES'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -4549,6 +4549,135 @@ then
|
|||
|
||||
|
||||
|
||||
for ac_prog in docbook2html db2html
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_DB2HTML+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$DB2HTML"; then
|
||||
ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_DB2HTML="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
DB2HTML=$ac_cv_prog_DB2HTML
|
||||
if test -n "$DB2HTML"; then
|
||||
echo "$as_me:$LINENO: result: $DB2HTML" >&5
|
||||
echo "${ECHO_T}$DB2HTML" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$DB2HTML" && break
|
||||
done
|
||||
test -n "$DB2HTML" || DB2HTML="false"
|
||||
|
||||
|
||||
|
||||
for ac_prog in docbook2pdf db2pdf
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_DB2PDF+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$DB2PDF"; then
|
||||
ac_cv_prog_DB2PDF="$DB2PDF" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_DB2PDF="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
DB2PDF=$ac_cv_prog_DB2PDF
|
||||
if test -n "$DB2PDF"; then
|
||||
echo "$as_me:$LINENO: result: $DB2PDF" >&5
|
||||
echo "${ECHO_T}$DB2PDF" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$DB2PDF" && break
|
||||
done
|
||||
test -n "$DB2PDF" || DB2PDF="false"
|
||||
|
||||
|
||||
|
||||
for ac_prog in docbook2ps db2ps
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_DB2PS+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$DB2PS"; then
|
||||
ac_cv_prog_DB2PS="$DB2PS" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_DB2PS="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
DB2PS=$ac_cv_prog_DB2PS
|
||||
if test -n "$DB2PS"; then
|
||||
echo "$as_me:$LINENO: result: $DB2PS" >&5
|
||||
echo "${ECHO_T}$DB2PS" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$DB2PS" && break
|
||||
done
|
||||
test -n "$DB2PS" || DB2PS="false"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for sqrt in -lm" >&5
|
||||
|
|
@ -14493,6 +14622,9 @@ s,@C2MAN@,$C2MAN,;t t
|
|||
s,@LDCONFIG@,$LDCONFIG,;t t
|
||||
s,@LINT@,$LINT,;t t
|
||||
s,@LINTFLAGS@,$LINTFLAGS,;t t
|
||||
s,@DB2HTML@,$DB2HTML,;t t
|
||||
s,@DB2PDF@,$DB2PDF,;t t
|
||||
s,@DB2PS@,$DB2PS,;t t
|
||||
s,@JPEGLIB@,$JPEGLIB,;t t
|
||||
s,@EGREP@,$EGREP,;t t
|
||||
s,@XLIB@,$XLIB,;t t
|
||||
|
|
|
|||
12
configure.ac
12
configure.ac
|
|
@ -102,6 +102,18 @@ fi
|
|||
AC_SUBST(LINT)
|
||||
AC_SUBST(LINTFLAGS)
|
||||
|
||||
dnl Check for db2html
|
||||
AC_CHECK_PROGS(DB2HTML, docbook2html db2html, false)
|
||||
AC_SUBST(DB2HTML)
|
||||
|
||||
dnl Check for db2pdf
|
||||
AC_CHECK_PROGS(DB2PDF, docbook2pdf db2pdf, false)
|
||||
AC_SUBST(DB2PDF)
|
||||
|
||||
dnl Check for db2ps
|
||||
AC_CHECK_PROGS(DB2PS, docbook2ps db2ps, false)
|
||||
AC_SUBST(DB2PS)
|
||||
|
||||
dnl **** Check for some libraries ****
|
||||
|
||||
dnl Check for -lm
|
||||
|
|
|
|||
|
|
@ -4,10 +4,14 @@
|
|||
*.log
|
||||
*.out
|
||||
*.tex
|
||||
*.pdf
|
||||
*.ps
|
||||
DBTOHTML_OUTPUT_DIR*
|
||||
Makefile
|
||||
wine-doc
|
||||
wine-doc.pdf
|
||||
wine-doc.ps
|
||||
wine-doc.rtf
|
||||
wine-user
|
||||
wine-devel
|
||||
winelib-user
|
||||
wine-pkg
|
||||
wine.man
|
||||
|
|
|
|||
|
|
@ -4,74 +4,104 @@ SRCDIR = @srcdir@
|
|||
VPATH = @srcdir@
|
||||
MODULE = none
|
||||
BOOKNAME = wine-doc
|
||||
DB2HTML = db2html
|
||||
DB2HTML = @DB2HTML@
|
||||
DB2PDF = @DB2PDF@
|
||||
DB2PS = @DB2PS@
|
||||
|
||||
EXTRASUBDIRS = samples status
|
||||
|
||||
BOOK_SRCS = \
|
||||
architecture.sgml \
|
||||
WINE_USER_SRCS = \
|
||||
bugs.sgml \
|
||||
configuring.sgml \
|
||||
fonts.sgml \
|
||||
getting.sgml \
|
||||
installing.sgml \
|
||||
introduction.sgml \
|
||||
printing.sgml \
|
||||
registry.sgml \
|
||||
running.sgml
|
||||
|
||||
WINE_DEVEL_SRCS = \
|
||||
architecture.sgml \
|
||||
build.sgml \
|
||||
compiling.sgml \
|
||||
configuring.sgml \
|
||||
consoles.sgml \
|
||||
cvs-regression.sgml \
|
||||
debugger.sgml \
|
||||
debugging.sgml \
|
||||
dlls.sgml \
|
||||
documentation.sgml \
|
||||
fonts.sgml \
|
||||
getting.sgml \
|
||||
i18n.sgml \
|
||||
implementation.sgml \
|
||||
installing.sgml \
|
||||
introduction.sgml \
|
||||
multimedia.sgml \
|
||||
ole.sgml \
|
||||
opengl.sgml \
|
||||
packaging.sgml \
|
||||
patches.sgml \
|
||||
porting.sgml \
|
||||
printing.sgml \
|
||||
registry.sgml \
|
||||
running.sgml \
|
||||
testing.sgml \
|
||||
tools.sgml \
|
||||
wine-doc.sgml \
|
||||
tools.sgml
|
||||
|
||||
WINELIB_USER_SRCS = \
|
||||
winelib-bindlls.sgml \
|
||||
winelib-intro.sgml \
|
||||
winelib-mfc.sgml \
|
||||
winelib-pkg.sgml \
|
||||
winelib-porting.sgml \
|
||||
winelib-toolkit.sgml \
|
||||
winelib-user.sgml
|
||||
winelib-toolkit.sgml
|
||||
|
||||
WINE_PKG_SRCS = \
|
||||
packaging.sgml
|
||||
|
||||
WINE_DOC_SRCS = \
|
||||
$(WINELIB_USER_SRCS) \
|
||||
$(WINE_DEVEL_SRCS) \
|
||||
$(WINE_PKG_SRCS) \
|
||||
$(WINE_USER_SRCS)
|
||||
|
||||
MAN_TARGETS = wine.man
|
||||
|
||||
BOOK_TARGETS = \
|
||||
$(BOOKNAME)/index.html \
|
||||
$(BOOKNAME).pdf \
|
||||
$(BOOKNAME).ps
|
||||
ALLBOOKS = \
|
||||
wine-devel \
|
||||
wine-pkg \
|
||||
wine-user \
|
||||
winelib-user
|
||||
|
||||
BOOKS_TARGETS = \
|
||||
$(ALLBOOKS:%=%/index.html) \
|
||||
$(ALLBOOKS:%=%.pdf) \
|
||||
$(ALLBOOKS:%=%.ps)
|
||||
|
||||
all: $(MAN_TARGETS)
|
||||
|
||||
@MAKE_RULES@
|
||||
|
||||
everything: $(MAN_TARGETS) $(BOOK_TARGETS)
|
||||
doc: $(BOOK_TARGETS)
|
||||
html: $(BOOKNAME)/index.html
|
||||
pdf: $(BOOKNAME).pdf
|
||||
ps: $(BOOKNAME).ps
|
||||
everything: $(MAN_TARGETS) $(BOOKS_TARGETS)
|
||||
doc: $(BOOKS_TARGETS)
|
||||
html: $(ALLBOOKS:%=%/index.html)
|
||||
pdf: $(ALLBOOKS:%=%.pdf)
|
||||
ps: $(ALLBOOKS:%=%.ps)
|
||||
|
||||
.PHONY: everything doc html pdf ps
|
||||
# this is the all-in-one book, not built by default
|
||||
wine-doc: wine-doc/index.html wine-doc.pdf wine-doc.ps
|
||||
|
||||
$(BOOKNAME)/index.html: $(BOOK_SRCS)
|
||||
$(DB2HTML) $(BOOKNAME).sgml
|
||||
.PHONY: everything doc html pdf ps wine-doc
|
||||
|
||||
$(BOOKNAME).pdf: $(BOOK_SRCS)
|
||||
db2pdf -d ./print.dsl $(BOOKNAME).sgml > /dev/null
|
||||
.SUFFIXES: .sgml /index.html .pdf .ps
|
||||
|
||||
$(BOOKNAME).ps: $(BOOK_SRCS)
|
||||
db2ps $(BOOKNAME).sgml > /dev/null
|
||||
.sgml/index.html:
|
||||
$(DB2HTML) -d $(SRCDIR)/default.dsl -o $* $<
|
||||
|
||||
.sgml.pdf:
|
||||
$(DB2PDF) -d $(SRCDIR)/print.dsl $< >/dev/null
|
||||
|
||||
.sgml.ps:
|
||||
$(DB2PS) $< >/dev/null
|
||||
|
||||
wine-devel.pdf wine-devel.ps wine-devel/index.html: $(WINE_DEVEL_SRCS)
|
||||
wine-pkg.pdf wine-pkg.ps wine-pkg/index.html: $(WINE_PKG_SRCS)
|
||||
wine-user.pdf wine-user.ps wine-user/index.html: $(WINE_USER_SRCS)
|
||||
winelib-user.pdf winelib-user.ps winelib-user/index.html: $(WINELIB_USER_SRCS)
|
||||
wine-doc.pdf wine-doc.ps wine-doc/index.html: $(WINE_DOC_SRCS)
|
||||
|
||||
wine.man: wine.man.in
|
||||
sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.man.in >$@ || $(RM) $@
|
||||
|
|
@ -86,7 +116,7 @@ uninstall::
|
|||
$(RM) $(mandir)/man$(conf_manext)/wine.conf.$(conf_manext)
|
||||
|
||||
clean::
|
||||
$(RM) *.aux *.dvi *.out *.pdf *.ps *.tex *.log $(BOOKNAME).pdf $(BOOKNAME).ps $(MAN_TARGETS)
|
||||
$(RM) -r $(BOOKNAME) html man3w *.junk DBTOHTML_OUTPUT_DIR*
|
||||
$(RM) *.aux *.dvi *.out *.pdf *.ps *.tex *.log $(MAN_TARGETS)
|
||||
$(RM) -r wine-doc $(ALLBOOKS) html man3w *.junk DBTOHTML_OUTPUT_DIR*
|
||||
|
||||
### Dependencies:
|
||||
|
|
|
|||
Loading…
Reference in New Issue