mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- move "$(LIBTOOL) --mode=link" into the @LINK@ configure variable, so that

Browse Source 
it doesn't show up in nmake makefiles
This commit is contained in:
Bryce Denney 2002-11-20 20:42:40 +00:00
parent 691c9d56c7
commit 0ab5bfa1d2
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/Makefile.in
View File

@ -176,7 +176,7 @@ bochs@EXE@: @IODEV_LIB_VAR@ @DEBUGGER_VAR@ \
cpu/libcpu.a memory/libmemory.a gui/libgui.a \ cpu/libcpu.a memory/libmemory.a gui/libgui.a \
@DISASM_VAR@ @INSTRUMENT_VAR@ $(BX_OBJS) \ @DISASM_VAR@ @INSTRUMENT_VAR@ $(BX_OBJS) \
$(SIMX86_OBJS) $(FPU_LIB) @GDBSTUB_VAR@ @PLUGIN_VAR@ $(SIMX86_OBJS) $(FPU_LIB) @GDBSTUB_VAR@ @PLUGIN_VAR@
$(LIBTOOL) --mode=link @LINK@ -export-dynamic $(BX_OBJS) $(SIMX86_OBJS) \ @LINK@ -export-dynamic $(BX_OBJS) $(SIMX86_OBJS) \
iodev/libiodev.a cpu/libcpu.a memory/libmemory.a gui/libgui.a \ iodev/libiodev.a cpu/libcpu.a memory/libmemory.a gui/libgui.a \
@DEBUGGER_VAR@ @DISASM_VAR@ @INSTRUMENT_VAR@ @PLUGIN_VAR@ \ @DEBUGGER_VAR@ @DISASM_VAR@ @INSTRUMENT_VAR@ @PLUGIN_VAR@ \
@GDBSTUB_VAR@ \ @GDBSTUB_VAR@ \
@ -235,7 +235,7 @@ $(BX_OBJS): $(BX_INCLUDES)
bxversion.h: bxversion.h:
$(RM) -f bxversion.h $(RM) -f bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
echo '// $$Id: Makefile.in,v 1.109 2002-11-20 13:01:57 bdenney Exp $$' >> bxversion.h echo '// $$Id: Makefile.in,v 1.110 2002-11-20 20:42:38 bdenney Exp $$' >> bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
echo '// This file is generated by "make bxversion.h"' >> bxversion.h echo '// This file is generated by "make bxversion.h"' >> bxversion.h
echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h

7
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in,v 1.169 2002/11/19 16:36:17 bdenney Exp . # From configure.in Id: configure.in,v 1.171 2002/11/20 12:42:53 bdenney Exp .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53. # Generated by GNU Autoconf 2.53.
# #
@ -20420,8 +20420,8 @@ CFP=""
OFP="-o " OFP="-o "
MAKELIB="ar rv \$@" MAKELIB="ar rv \$@"
RMCOMMAND="rm -f " RMCOMMAND="rm -f "
LINK="\$(CXX) -o \$@ \$(CXXFLAGS) \$(LDFLAGS)" LINK="\$(LIBTOOL) --mode=link \$(CXX) -o \$@ \$(CXXFLAGS) \$(LDFLAGS)"
LINK_CONSOLE="\$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE) \$(LDFLAGS)" LINK_CONSOLE="\$(LIBTOOL) --mode=link \$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE) \$(LDFLAGS)"
EXE="" EXE=""
COMMAND_SEPARATOR="&& \\" COMMAND_SEPARATOR="&& \\"
CD_UP_ONE="echo done" CD_UP_ONE="echo done"
@ -20754,6 +20754,7 @@ _ACEOF
CXXFP="/Tp" CXXFP="/Tp"
CFP="/Tc" CFP="/Tc"
OFP="/Fo" OFP="/Fo"
MAKE=nmake
MAKELIB="lib.exe /nologo /subsystem:console /machine:I386 /verbose /out:\$@" MAKELIB="lib.exe /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
RMCOMMAND="-del" RMCOMMAND="-del"
RANLIB="echo" RANLIB="echo"

6
bochs/configure.in
View File

@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50) AC_PREREQ(2.50)
AC_INIT(bochs.h) AC_INIT(bochs.h)
AC_REVISION([[$Id: configure.in,v 1.171 2002-11-20 12:42:53 bdenney Exp $]]) AC_REVISION([[$Id: configure.in,v 1.172 2002-11-20 20:42:39 bdenney Exp $]])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h) AC_CONFIG_HEADER(ltdlconf.h)
@ -1571,8 +1571,8 @@ CFP=""
OFP="-o " OFP="-o "
MAKELIB="ar rv \$@" MAKELIB="ar rv \$@"
RMCOMMAND="rm -f " RMCOMMAND="rm -f "
LINK="\$(CXX) -o \$@ \$(CXXFLAGS) \$(LDFLAGS)" LINK="\$(LIBTOOL) --mode=link \$(CXX) -o \$@ \$(CXXFLAGS) \$(LDFLAGS)"
LINK_CONSOLE="\$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE) \$(LDFLAGS)" LINK_CONSOLE="\$(LIBTOOL) --mode=link \$(CXX) -o \$@ \$(CXXFLAGS_CONSOLE) \$(LDFLAGS)"
EXE="" EXE=""
COMMAND_SEPARATOR="&& \\" COMMAND_SEPARATOR="&& \\"
CD_UP_ONE="echo done" CD_UP_ONE="echo done"