- if we're going to build docbook files, do it during make rather than
make install
This commit is contained in:
Bryce Denney
parent
799dba6ac6
commit
610116cf45
@ -171,7 +171,7 @@ BX_INCLUDES = bochs.h config.h osdep.h
|
||||
$(CC) @DASH@c $(BX_INCDIRS) $(CFLAGS) $(FPU_FLAGS) $< @OFP@$@
|
||||
|
||||
|
||||
all: @PRIMARY_TARGET@ @PLUGIN_TARGET@ bximage@EXE@
|
||||
all: @PRIMARY_TARGET@ @PLUGIN_TARGET@ bximage@EXE@ @BUILD_DOCBOOK_VAR@
|
||||
|
||||
@EXTERNAL_DEPENDENCY@
|
||||
|
||||
@ -238,7 +238,7 @@ $(BX_OBJS): $(BX_INCLUDES)
|
||||
bxversion.h:
|
||||
$(RM) -f bxversion.h
|
||||
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
|
||||
echo '// $$Id: Makefile.in,v 1.130 2002-12-13 17:47:21 bdenney Exp $$' >> bxversion.h
|
||||
echo '// $$Id: Makefile.in,v 1.131 2002-12-13 20:37:37 bdenney Exp $$' >> bxversion.h
|
||||
echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
|
||||
echo '// This file is generated by "make bxversion.h"' >> bxversion.h
|
||||
echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
|
||||
@ -368,7 +368,11 @@ install_doc::
|
||||
$(CAT) $(srcdir)/build/linux/README.linux-binary $(srcdir)/README > $(DESTDIR)$(docdir)/README
|
||||
$(CP) $(srcdir)/.bochsrc $(DESTDIR)$(docdir)/bochsrc-sample.txt
|
||||
|
||||
install_docbook:
|
||||
|
||||
build_docbook::
|
||||
cd doc/docbook; make
|
||||
|
||||
install_docbook: build_docbook
|
||||
cd doc/docbook; make install
|
||||
|
||||
install_man::
|
||||
|
||||
44
bochs/configure
vendored
44
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.186 2002/12/13 16:20:34 bdenney Exp .
|
||||
# From configure.in Id: configure.in,v 1.188 2002/12/13 17:52:09 bdenney Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.53.
|
||||
#
|
||||
@ -1006,11 +1006,10 @@ Optional Features:
|
||||
--enable-ltdl-install install libltdl
|
||||
--disable-largefile omit support for large files
|
||||
--enable-config-interface turns on/off configuration interface
|
||||
--enable-control-panel Deprecated. Use --enable-config-interface.
|
||||
--enable-new-pit use Greg Alexander's new PIT model
|
||||
--enable-slowdown use Greg Alexander's slowdown timer
|
||||
--enable-idle-hack use Roland Mainz's idle hack
|
||||
--enable-plugins enable plugins
|
||||
--enable-plugins enable plugins
|
||||
--enable-processors select number of processors (1,2,4,8)
|
||||
--enable-x86-64 compile in support for x86-64 instructions
|
||||
--enable-cpu-level select cpu level (3,4,5,6)
|
||||
@ -1066,7 +1065,7 @@ Optional Packages:
|
||||
--with-rfb use RFB protocol, works with VNC viewer
|
||||
--with-amigaos use MorphOS (Amiga)
|
||||
--with-sdl use SDL libraries
|
||||
--with-svga use SVGALib libraries
|
||||
--with-svga use SVGALib libraries
|
||||
--with-wx use wxWindows libraries
|
||||
--with-all-libs compile all guis that Bochs supports
|
||||
|
||||
@ -4206,7 +4205,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
|
||||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4209 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4208 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -4756,7 +4755,7 @@ chmod -w .
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
|
||||
compiler_c_o=no
|
||||
if { (eval echo configure:4759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
if { (eval echo configure:4758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
if test -s out/conftest.err; then
|
||||
@ -6587,7 +6586,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6590 "configure"
|
||||
#line 6589 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -6685,7 +6684,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6688 "configure"
|
||||
#line 6687 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -8727,7 +8726,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8730 "configure"
|
||||
#line 8729 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -18074,30 +18073,6 @@ echo "${ECHO_T}yes" >&6
|
||||
use_config_interface=1
|
||||
|
||||
|
||||
fi;
|
||||
|
||||
# continue to support --enable-control-panel and make it do the same, but with no default
|
||||
# as before.
|
||||
echo "$as_me:$LINENO: checking for control panel" >&5
|
||||
echo $ECHO_N "checking for control panel... $ECHO_C" >&6
|
||||
# Check whether --enable-control-panel or --disable-control-panel was given.
|
||||
if test "${enable_control_panel+set}" = set; then
|
||||
enableval="$enable_control_panel"
|
||||
if test "$enableval" = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
use_config_interface=1
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
use_config_interface=0
|
||||
fi
|
||||
else
|
||||
|
||||
echo "$as_me:$LINENO: result: same as config-interface setting" >&5
|
||||
echo "${ECHO_T}same as config-interface setting" >&6
|
||||
|
||||
|
||||
fi;
|
||||
|
||||
if test "$use_config_interface" = 1; then
|
||||
@ -20883,6 +20858,7 @@ fi;
|
||||
if test $build_docbook = 1; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
BUILD_DOCBOOK_VAR=build_docbook
|
||||
INSTALL_DOCBOOK_VAR=install_docbook
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
@ -20891,6 +20867,7 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
PRIMARY_TARGET='bochs'
|
||||
PLUGIN_LIBNAME_TRANSFORMATION='%.o=libbx_%.la'
|
||||
|
||||
@ -23291,6 +23268,7 @@ s,@SOUNDLOW_OBJS@,$SOUNDLOW_OBJS,;t t
|
||||
s,@GDBSTUB_VAR@,$GDBSTUB_VAR,;t t
|
||||
s,@IODEBUG_OBJS@,$IODEBUG_OBJS,;t t
|
||||
s,@DOCBOOK2HTML@,$DOCBOOK2HTML,;t t
|
||||
s,@BUILD_DOCBOOK_VAR@,$BUILD_DOCBOOK_VAR,;t t
|
||||
s,@INSTALL_DOCBOOK_VAR@,$INSTALL_DOCBOOK_VAR,;t t
|
||||
s,@IODEV_LIB_VAR@,$IODEV_LIB_VAR,;t t
|
||||
s,@EXTRA_BX_OBJS@,$EXTRA_BX_OBJS,;t t
|
||||
|
||||
@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT(bochs.h)
|
||||
AC_REVISION([[$Id: configure.in,v 1.188 2002-12-13 17:52:09 bdenney Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.189 2002-12-13 20:37:37 bdenney Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
@ -1522,10 +1522,12 @@ AC_ARG_ENABLE(docbook,
|
||||
|
||||
if test $build_docbook = 1; then
|
||||
AC_MSG_RESULT(yes)
|
||||
BUILD_DOCBOOK_VAR=build_docbook
|
||||
INSTALL_DOCBOOK_VAR=install_docbook
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
AC_SUBST(BUILD_DOCBOOK_VAR)
|
||||
AC_SUBST(INSTALL_DOCBOOK_VAR)
|
||||
AC_SUBST(DOCBOOK2HTML)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user