out of treee builds broken

[Marcus Meissner]

Hi,

Out of tree builds are broken due to the authors.c generation:

../../tools/winebuild/winebuild -D__WINESRC__ -D_SHELL32_ -DCOM_NO_WINDOWS_H -o shell32.dll.dbg.c --debug -C/suse/meissner/projects/marcus-wine-20031016/dlls/shell32 authors.c brsfolder.c changenotify.c classes.c clipboard.c control.c dataobject.c debughlp.c dialogs.c dragdrophelper.c enumidlist.c folders.c iconcache.c memorystream.c pidl.c regsvr.c shell32_main.c shelllink.c shellole.c shellord.c shellpath.c shellreg.c shellstring.c shfldr_desktop.c shfldr_fs.c shfldr_mycomp.c shlexec.c shlfileop.c shlfolder.c shlfsbind.c shlmenu.c shlview.c shpolicy.c shv_bg_cmenu.c shv_item_cmenu.c systray.c shell.c
Cannot open file '/suse/meissner/projects/marcus-wine-20031016/dlls/shell32/authors.c'

It looks for authors.c in the srcdir, not in the objdir.

Ciao, Marcus

[Alexandre Julliard]

Marcus Meissner  writes:
> It looks for authors.c in the srcdir, not in the objdir.

This should fix it:

Index: tools/winebuild/utils.c
===================================================================
RCS file: /opt/cvs-commit/wine/tools/winebuild/utils.c,v
retrieving revision 1.17
diff -u -p -r1.17 utils.c
--- tools/winebuild/utils.c	22 Sep 2003 19:27:56 -0000	1.17
+++ tools/winebuild/utils.c	19 Nov 2003 21:45:22 -0000
@@ -176,18 +176,19 @@ void dump_bytes( FILE *outfile, const un
 FILE *open_input_file( const char *srcdir, const char *name )
 {
     char *fullname;
-    FILE *file;
+    FILE *file = fopen( name, "r" );

-    if (srcdir)
+    if (!file && srcdir)
     {
         fullname = xmalloc( strlen(srcdir) + strlen(name) + 2 );
         strcpy( fullname, srcdir );
         strcat( fullname, "/" );
         strcat( fullname, name );
+        file = fopen( fullname, "r" );
     }
     else fullname = xstrdup( name );

-    if (!(file = fopen( fullname, "r" ))) fatal_error( "Cannot open file '%s'\n", fullname );
+    if (!file) fatal_error( "Cannot open file '%s'\n", fullname );
     input_file_name = fullname;
     current_line = 1;
     return file;

[Marcus Meissner]

On Wed, Nov 19, 2003 at 01:47:28PM -0800, WINE wrote:
> Marcus Meissner  writes:
> > It looks for authors.c in the srcdir, not in the objdir.
>
> This should fix it:
>
> Index: tools/winebuild/utils.c

Works fine. :)

Thanks & Ciao, Marcus