Compile broken on Ubuntu Hardy/gutsy/feisty

[Austin English]

In today's git, I can't compile in either my Kubuntu Hardy or Ubuntu
feisty machines. A user also reported this on wine-user (1), using
Ubuntu Gutsy (64bit). Compile is failing in make depend on:

make[2]: Entering directory `/home/austin/wine-git/dlls/qedit/tests'
../../../tools/makedep -C. -S../../.. -T../../..  mediadet.c  qedit.rc
sound_test.avi: No such file or directory
  sound_test.avi was first included from qedit.rc:25
make[2]: *** [depend] Error 1
make[2]: Leaving directory `/home/austin/wine-git/dlls/qedit/tests'
make[1]: *** [qedit/tests/__depend__] Error 2
make[1]: Leaving directory `/home/austin/wine-git/dlls'
make: *** [dlls/__depend__] Error 2

Regression test points to:

austin@austin-desktop:~/wine-git$ git bisect good
d3061d48e1c78c331b93be7a880876ebff2730dd is first bad commit
commit d3061d48e1c78c331b93be7a880876ebff2730dd
Author: Dan Hipschman 
Date:   Tue Apr 8 16:53:52 2008 -0700

qedit: Implement IMediaDet_get_OutputStreams.

:040000 040000 a897c878bae291a217075d8a2db3c6d04de1ad2a
6d6e883a2629e004b361ceb844a0ca0680a1fa75 M      dlls

The patch below fixes it:
diff --git a/dlls/qedit/tests/qedit.rc b/dlls/qedit/tests/qedit.rc
index a0b8b80..733beac 100644
--- a/dlls/qedit/tests/qedit.rc
+++ b/dlls/qedit/tests/qedit.rc
@@ -22,5 +22,5 @@

/* @makedep: test.avi */
 TEST_AVI_RES       AVI_RES_TYPE test.avi
-/* @makedep: sound_test.avi */
+/* @makedep: test_sound.avi */
 TEST_SOUND_AVI_RES AVI_RES_TYPE test_sound.avi

I'll submit it to wine-patches.
(1) http://forum.winehq.org/viewtopic.php?t=498

[Detlef Riekenberg]

On Mi, 2008-04-09 at 12:08 -0500, Austin English wrote:
> In today's git, I can't compile in either my Kubuntu Hardy or Ubuntu
> feisty machines. A user also reported this on wine-user (1), using
> Ubuntu Gutsy (64bit). Compile is failing in make depend on:

It's fixed in git. Mikolaj did a Patch hours ago.