Module: wine Branch: master Commit: c195e1355a60db099d5fe32be59a77f1320071c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c195e1355a60db099d5fe32be5...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Feb 15 10:53:00 2014 +0100
makedep: Look for source files only in the source directory.
---
tools/makedep.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/tools/makedep.c b/tools/makedep.c index 6ad2ade..345dd37 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -673,18 +673,10 @@ static FILE *open_src_file( struct incl_file *pFile ) { FILE *file;
- /* first try name as is */ - if ((file = open_file( pFile->name ))) - { - pFile->filename = xstrdup( pFile->name ); - return file; - } - /* now try in source dir */ - if (src_dir) - { - pFile->filename = src_dir_path( pFile->name ); - file = open_file( pFile->filename ); - } + /* try in source dir */ + pFile->filename = src_dir_path( pFile->name ); + file = open_file( pFile->filename ); + /* now try parent dir */ if (!file && parent_dir) {