From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCDIu-0004Vg-Lj for qemu-devel@nongnu.org; Sun, 22 Nov 2009 09:20:40 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCDIr-0004TS-2P for qemu-devel@nongnu.org; Sun, 22 Nov 2009 09:20:40 -0500 Received: from [199.232.76.173] (port=33542 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCDIq-0004TL-R8 for qemu-devel@nongnu.org; Sun, 22 Nov 2009 09:20:36 -0500 Received: from mail-pz0-f188.google.com ([209.85.222.188]:57966) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCDIq-0003eF-Gv for qemu-devel@nongnu.org; Sun, 22 Nov 2009 09:20:36 -0500 Received: by pzk26 with SMTP id 26so3008578pzk.4 for ; Sun, 22 Nov 2009 06:20:35 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1258898842-5222-1-git-send-email-weil@mail.berlios.de> References: <1258898842-5222-1-git-send-email-weil@mail.berlios.de> Date: Sun, 22 Nov 2009 22:20:34 +0800 Message-ID: Subject: Re: [Qemu-devel] [PATCH] Makefile: Add missing rule for config-devices.mak From: Scott Tsai Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: QEMU Developers On Sun, Nov 22, 2009 at 10:07 PM, Stefan Weil wrote: > All files config-devices.mak are copies from files in > directory default-configs. > > Creating these copies during configuration ignores these > dependencies and may result in unresolved externals > from incremental builds when files in default-configs > are modified. > > By adding a dependency rule to Makefile and executing > the copy commands there it is possible to run incremental > builds even with modified default-configs. > > This is especially useful for git bisect. > > Signed-off-by: Stefan Weil > --- > =C2=A0Makefile =C2=A0| =C2=A0 =C2=A03 +++ > =C2=A0configure | =C2=A0 =C2=A04 ---- > =C2=A02 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/Makefile b/Makefile > index d770e2a..fdb47fb 100644 > --- a/Makefile > +++ b/Makefile > @@ -41,6 +41,9 @@ SUBDIR_DEVICES_MAK=3D$(patsubst %, %/config-devices.mak= , $(TARGET_DIRS)) > =C2=A0config-all-devices.mak: $(SUBDIR_DEVICES_MAK) > =C2=A0 =C2=A0 =C2=A0 =C2=A0$(call quiet-command,cat $(SUBDIR_DEVICES_MAK)= | grep "=3Dy$$" | sort -u > $@," =C2=A0GEN =C2=A0 $@") > > +%/config-devices.mak: default-configs/%.mak > + =C2=A0 =C2=A0 =C2=A0 $(call quiet-command,cp -p $< $@, " =C2=A0GEN =C2= =A0 $@") > + > =C2=A0-include config-all-devices.mak > > =C2=A0build-all: $(DOCS) $(TOOLS) recurse-all > diff --git a/configure b/configure > index b65c11c..1223fc8 100755 > --- a/configure > +++ b/configure > @@ -2209,10 +2209,6 @@ if test "$target" =3D "arm-linux-user" -o "$target= " =3D "armeb-linux-user" -o "$targ > =C2=A0 mkdir -p $target_dir/nwfpe > =C2=A0fi > > -if test ! -f $target_dir/config-devices.mak ; then > - =C2=A0cp $source_path/default-configs/${target}.mak $target_dir/config-= devices.mak > -fi > - > =C2=A0# > =C2=A0# don't use ln -sf as not all "ln -sf" over write the file/link > =C2=A0# > -- > 1.5.6.5 Acked-by Scott Tsai I also hit this with the recent change to move two NICs into libhw and build them for ARM targets.