--- Makefile.orig 2005-04-28 00:52:05 +0400 +++ Makefile 2005-05-19 21:29:57 +0400 @@ -17,13 +17,6 @@ for d in $(TARGET_DIRS); do \ $(MAKE) -C $$d $@ || exit 1 ; \ done -ifdef CONFIG_KQEMU -ifdef CONFIG_WIN32 - $(MAKE) -C kqemu -f Makefile.winnt -else - $(MAKE) -C kqemu -endif -endif qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS) @@ -39,9 +32,6 @@ for d in $(TARGET_DIRS); do \ $(MAKE) -C $$d $@ || exit 1 ; \ done -ifdef CONFIG_KQEMU - $(MAKE) -C kqemu clean -endif distclean: clean rm -f config-host.mak config-host.h @@ -73,9 +63,6 @@ for d in $(TARGET_DIRS); do \ $(MAKE) -C $$d $@ || exit 1 ; \ done -ifdef CONFIG_KQEMU - cd kqemu ; ./install.sh -endif # various test targets test speed test2: all --- configure.orig 2005-04-28 00:52:05 +0400 +++ configure 2005-05-19 21:48:11 +0400 @@ -364,41 +364,12 @@ kqemu="no" fi fi - -# Linux specific kqemu configuration -if test $kqemu = "yes" -a $linux = "yes" ; then -# find the kernel path -if test -z "$kernel_path" ; then -kernel_version=`uname -r` -kernel_path="/lib/modules/$kernel_version/build" -if test '!' -d "$kernel_path/include" ; then - kernel_path="/usr/src/linux" - if test '!' -d "$kernel_path/include" ; then - echo "Could not find kernel includes in /lib/modules or /usr/src/linux - cannot build the kqemu module" - kqemu="no" - fi -fi -fi if test $kqemu = "yes" ; then - -# test that the kernel config is present -if test '!' -f "$kernel_path/Makefile" ; then - echo "No Makefile file present in $kernel_path - kqemu cannot be built" - kqemu="no" -fi - -# find build system (2.6 or legacy) -kbuild26="yes" -if grep -q "PATCHLEVEL = 4" $kernel_path/Makefile ; then -kbuild26="no" -fi - + # find build system (2.6 or legacy) + kbuild26="yes" fi # kqemu -fi # kqemu and linux - - echo "Install prefix $prefix" echo "BIOS directory $datadir" echo "binary directory $bindir"