Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5d4ca222
Commit
5d4ca222
authored
Jan 21, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Also look for generated includes in the source file directory.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9da18136
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
1 deletion
+25
-1
makedep.c
tools/makedep.c
+25
-1
No files found.
tools/makedep.c
View file @
5d4ca222
...
...
@@ -1204,6 +1204,28 @@ static struct file *open_file_same_dir( const struct incl_file *parent, const ch
/*******************************************************************
* open_same_dir_generated_file
*
* Open a generated_file in the same directory as the parent.
*/
static
struct
file
*
open_same_dir_generated_file
(
const
struct
makefile
*
make
,
const
struct
incl_file
*
parent
,
struct
incl_file
*
file
,
const
char
*
ext
,
const
char
*
src_ext
)
{
char
*
filename
;
struct
file
*
ret
=
NULL
;
if
(
strendswith
(
file
->
name
,
ext
)
&&
(
ret
=
open_file_same_dir
(
parent
,
replace_extension
(
file
->
name
,
ext
,
src_ext
),
&
filename
)))
{
file
->
sourcename
=
filename
;
file
->
filename
=
obj_dir_path
(
make
,
replace_filename
(
parent
->
name
,
file
->
name
));
}
return
ret
;
}
/*******************************************************************
* open_local_file
*
* Open a file in the source directory of the makefile.
...
...
@@ -1426,7 +1448,9 @@ static struct file *open_include_file( const struct makefile *make, struct incl_
if
(
pFile
->
type
==
INCL_SYSTEM
)
return
NULL
;
/* ignore system files we cannot find */
/* try in src file directory */
if
((
file
=
open_file_same_dir
(
pFile
->
included_by
,
pFile
->
name
,
&
pFile
->
filename
)))
if
((
file
=
open_same_dir_generated_file
(
make
,
pFile
->
included_by
,
pFile
,
".tab.h"
,
".y"
))
||
(
file
=
open_same_dir_generated_file
(
make
,
pFile
->
included_by
,
pFile
,
".h"
,
".idl"
))
||
(
file
=
open_file_same_dir
(
pFile
->
included_by
,
pFile
->
name
,
&
pFile
->
filename
)))
{
pFile
->
is_external
=
pFile
->
included_by
->
is_external
;
return
file
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment