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

Some fixes in the build system.

Browse Source 
- Makefile: cleanup of the 'clean' target (adds missing 'bxhub').
- configure script: create cpudb subdirectories if necessary for building
  outside of the source tree.
- cpudb Makefile: clean object files from new location.
This commit is contained in:
Volker Ruppert 2017-03-15 16:51:32 +00:00
parent eeec43d811
commit 8796abeea6
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bochs/Makefile.in
View File

@ -530,12 +530,7 @@ zip:
clean: clean:
@RMCOMMAND@ *.o @RMCOMMAND@ *.o
@RMCOMMAND@ *.a @RMCOMMAND@ *.a
@RMCOMMAND@ bochs @RMCOMMAND@ bochs@EXE@ bximage@EXE@ @OPTIONAL_TARGET@
@RMCOMMAND@ bochs.exe
@RMCOMMAND@ bximage
@RMCOMMAND@ bximage.exe
@RMCOMMAND@ niclist
@RMCOMMAND@ niclist.exe
@RMCOMMAND@ bochs.out @RMCOMMAND@ bochs.out
@RMCOMMAND@ bochsout.txt @RMCOMMAND@ bochsout.txt
@RMCOMMAND@ *.exp *.lib @RMCOMMAND@ *.exp *.lib

4
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 13087 2017-02-27 22:26:43Z vruppert . # From configure.in Id: configure.in 13109 2017-03-12 07:48:08Z vruppert .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69. # Generated by GNU Autoconf 2.69.
# #
@ -27316,5 +27316,7 @@ fi
# Create some subdirectories for when you run configure from some other # Create some subdirectories for when you run configure from some other
# directory (part #2). # directory (part #2).
if test ! -d cpu/cpudb/amd; then mkdir cpu/cpudb/amd; fi
if test ! -d cpu/cpudb/intel; then mkdir cpu/cpudb/intel; fi
if test ! -d cpu/decoder; then mkdir cpu/decoder; fi if test ! -d cpu/decoder; then mkdir cpu/decoder; fi
if test ! -d iodev/network/slirp; then mkdir iodev/network/slirp; fi if test ! -d iodev/network/slirp; then mkdir iodev/network/slirp; fi

2
bochs/configure.in
View File

@ -3246,5 +3246,7 @@ AC_OUTPUT(Makefile iodev/Makefile iodev/display/Makefile iodev/hdimage/Makefile
# Create some subdirectories for when you run configure from some other # Create some subdirectories for when you run configure from some other
# directory (part #2). # directory (part #2).
if test ! -d cpu/cpudb/amd; then mkdir cpu/cpudb/amd; fi
if test ! -d cpu/cpudb/intel; then mkdir cpu/cpudb/intel; fi
if test ! -d cpu/decoder; then mkdir cpu/decoder; fi if test ! -d cpu/decoder; then mkdir cpu/decoder; fi
if test ! -d iodev/network/slirp; then mkdir iodev/network/slirp; fi if test ! -d iodev/network/slirp; then mkdir iodev/network/slirp; fi

5
bochs/cpu/cpudb/Makefile.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2015 The Bochs Project # Copyright (C) 2015-2017 The Bochs Project
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -76,7 +76,8 @@ libcpudb.a: $(CPUDB_OBJS)
$(CPUDB_OBJS): $(BX_INCLUDES) $(CPUDB_OBJS): $(BX_INCLUDES)
clean: clean:
@RMCOMMAND@ *.o @RMCOMMAND@ amd/*.o
@RMCOMMAND@ intel/*.o
@RMCOMMAND@ *.a @RMCOMMAND@ *.a
dist-clean: clean dist-clean: clean