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
edf4dab5
Commit
edf4dab5
authored
Oct 15, 2013
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Generate explicit build rules for testlist.c from makedep.
parent
d4593274
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
7 deletions
+22
-7
Make.rules.in
Make.rules.in
+0
-3
makedep.c
tools/makedep.c
+22
-4
No files found.
Make.rules.in
View file @
edf4dab5
...
@@ -123,9 +123,6 @@ $(CROSSTESTMODULE): $(CROSSOBJS) Makefile.in
...
@@ -123,9 +123,6 @@ $(CROSSTESTMODULE): $(CROSSOBJS) Makefile.in
$(WINETEST_RES): $(TESTMODULE_STRIPPED)
$(WINETEST_RES): $(TESTMODULE_STRIPPED)
echo "$(TESTMODULE) TESTRES \"$(TESTMODULE_STRIPPED)\"" | $(WRC) $(RCFLAGS) -o $@
echo "$(TESTMODULE) TESTRES \"$(TESTMODULE_STRIPPED)\"" | $(WRC) $(RCFLAGS) -o $@
testlist.c: Makefile.in $(MAKECTESTS)
$(MAKECTESTS) -o $@ $(C_SRCS)
testclean::
testclean::
$(RM) *.ok
$(RM) *.ok
...
...
tools/makedep.c
View file @
edf4dab5
...
@@ -835,6 +835,17 @@ static void parse_generated_idl( struct incl_file *source )
...
@@ -835,6 +835,17 @@ static void parse_generated_idl( struct incl_file *source )
}
}
/*******************************************************************
/*******************************************************************
* is_generated_idl
*/
static
int
is_generated_idl
(
struct
incl_file
*
source
)
{
return
(
strendswith
(
source
->
name
,
"_c.c"
)
||
strendswith
(
source
->
name
,
"_i.c"
)
||
strendswith
(
source
->
name
,
"_p.c"
)
||
strendswith
(
source
->
name
,
"_s.c"
));
}
/*******************************************************************
* parse_file
* parse_file
*/
*/
static
void
parse_file
(
struct
incl_file
*
source
,
int
src
)
static
void
parse_file
(
struct
incl_file
*
source
,
int
src
)
...
@@ -842,10 +853,7 @@ static void parse_file( struct incl_file *source, int src )
...
@@ -842,10 +853,7 @@ static void parse_file( struct incl_file *source, int src )
FILE
*
file
;
FILE
*
file
;
/* special case for source files generated from idl */
/* special case for source files generated from idl */
if
(
strendswith
(
source
->
name
,
"_c.c"
)
||
if
(
is_generated_idl
(
source
))
strendswith
(
source
->
name
,
"_i.c"
)
||
strendswith
(
source
->
name
,
"_p.c"
)
||
strendswith
(
source
->
name
,
"_s.c"
))
{
{
parse_generated_idl
(
source
);
parse_generated_idl
(
source
);
return
;
return
;
...
@@ -1106,6 +1114,16 @@ static void output_sources(void)
...
@@ -1106,6 +1114,16 @@ static void output_sources(void)
output_filename
(
source
->
filename
,
&
column
);
output_filename
(
source
->
filename
,
&
column
);
output
(
"
\n
"
);
output
(
"
\n
"
);
}
}
if
(
find_src_file
(
"testlist.o"
))
{
output
(
"testlist.c: $(MAKECTESTS) Makefile.in
\n
"
);
column
=
output
(
"
\t
$(MAKECTESTS) -o $@"
);
LIST_FOR_EACH_ENTRY
(
source
,
&
sources
,
struct
incl_file
,
entry
)
if
(
strendswith
(
source
->
name
,
".c"
)
&&
!
is_generated_idl
(
source
))
output_filename
(
source
->
filename
,
&
column
);
output
(
"
\n
"
);
}
}
}
...
...
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