Patchwork [00/15] Some networking code re-organization

login
register
mail settings
Submitter Mark McLoughlin
Date Oct. 23, 2009, 4:49 p.m.
Message ID <1256316592.31881.87.camel@blaa>
Download mbox | patch
Permalink /patch/36794/
State New
Headers show

Comments

Mark McLoughlin - Oct. 23, 2009, 4:49 p.m.
On Fri, 2009-10-23 at 08:44 -0500, Anthony Liguori wrote:
> Mark McLoughlin wrote:
> > On Thu, 2009-10-22 at 15:34 -0500, Anthony Liguori wrote:
> >   
> >> This series doesn't build for me.  I get dependency errors even after a 
> >> full rebuild.  I'm building from a separate directory fwiw.
> >>     
> >
> > Don't see it here, I'm afraid - any more details?
> >
> > Btw, it's all pushed to http://repo.or.cz/w/qemu/markmc.git if that
> > helps
> >   
> 
> Building master of that tree.  Source code is in 
> /home/anthony/git/qemu.  Build dir is /home/anthony/obj/qemu-tmp.  
> Configure line is ~/git/qemu/configure 
> --kerneldir=/home/anthony/git/kvm-userspace/kernel.
> 
> Attached the make V=1 output and configure output.

Thanks, I'll add using a separate build dir to my test matrix :)

Incremental patch below, will post a v2 of 01/15, also pushed to
net-cleanup.v2 branch

Thanks,
Mark.

Patch

diff --git a/Makefile b/Makefile
index 44bd7ef..41107a5 100644
--- a/Makefile
+++ b/Makefile
@@ -229,7 +229,7 @@  clean:
 # avoid old build problems by removing potentially incorrect old files
 	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
 	rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
-	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
+	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d
 	rm -f qemu-img-cmds.h
 	$(MAKE) -C tests clean
 	for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser; do \
@@ -413,4 +413,4 @@  tarbin:
 	$(mandir)/man8/qemu-nbd.8
 
 # Include automatically generated dependency files
--include $(wildcard *.d audio/*.d slirp/*.d block/*.d)
+-include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d)
diff --git a/configure b/configure
index 4ccdebe..b9fc32b 100755
--- a/configure
+++ b/configure
@@ -2533,7 +2533,7 @@  done # for target in $targets
 
 # build tree in object directory if source path is different from current one
 if test "$source_path_used" = "yes" ; then
-    DIRS="tests tests/cris slirp audio block pc-bios/optionrom"
+    DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
     DIRS="$DIRS roms/pcbios roms/seabios roms/vgabios"
     FILES="Makefile tests/Makefile"
     FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"