Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
3e6c12e7
Commit
3e6c12e7
authored
Feb 19, 2018
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Generate the testclean rule using the subdirs file lists.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
fcc0e762
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
aclocal.m4
aclocal.m4
+1
-3
configure
configure
+1
-3
makedep.c
tools/makedep.c
+11
-2
No files found.
aclocal.m4
View file @
3e6c12e7
...
@@ -542,9 +542,7 @@ programs/winetest: $ac_dir
...
@@ -542,9 +542,7 @@ programs/winetest: $ac_dir
check test: $ac_dir/test
check test: $ac_dir/test
.PHONY: $ac_dir/test
.PHONY: $ac_dir/test
$ac_dir/test: dummy
$ac_dir/test: dummy
@cd $ac_dir && \$(MAKE) test
@cd $ac_dir && \$(MAKE) test"
testclean::
\$(RM) $ac_dir/*.ok"
if test -n "$CROSSTARGET"
if test -n "$CROSSTARGET"
then
then
...
...
configure
View file @
3e6c12e7
...
@@ -8037,9 +8037,7 @@ programs/winetest: $ac_dir
...
@@ -8037,9 +8037,7 @@ programs/winetest: $ac_dir
check test:
$ac_dir
/test
check test:
$ac_dir
/test
.PHONY:
$ac_dir
/test
.PHONY:
$ac_dir
/test
$ac_dir
/test: dummy
$ac_dir
/test: dummy
@cd
$ac_dir
&&
\$
(MAKE) test
@cd
$ac_dir
&&
\$
(MAKE) test"
testclean::
\$
(RM)
$ac_dir
/*.ok"
if
test
-n
"
$CROSSTARGET
"
if
test
-n
"
$CROSSTARGET
"
then
then
...
...
tools/makedep.c
View file @
3e6c12e7
...
@@ -3326,8 +3326,9 @@ static void output_subdirs( struct makefile *make )
...
@@ -3326,8 +3326,9 @@ static void output_subdirs( struct makefile *make )
{
{
struct
strarray
build_deps
=
empty_strarray
;
struct
strarray
build_deps
=
empty_strarray
;
struct
strarray
makefile_deps
=
empty_strarray
;
struct
strarray
makefile_deps
=
empty_strarray
;
struct
strarray
testclean_files
=
empty_strarray
;
struct
strarray
distclean_files
=
get_expanded_make_var_array
(
make
,
"CONFIGURE_TARGETS"
);
struct
strarray
distclean_files
=
get_expanded_make_var_array
(
make
,
"CONFIGURE_TARGETS"
);
unsigned
int
i
;
unsigned
int
i
,
j
;
strarray_add
(
&
distclean_files
,
obj_dir_path
(
make
,
output_makefile_name
));
strarray_add
(
&
distclean_files
,
obj_dir_path
(
make
,
output_makefile_name
));
if
(
!
make
->
src_dir
)
strarray_add
(
&
distclean_files
,
obj_dir_path
(
make
,
".gitignore"
));
if
(
!
make
->
src_dir
)
strarray_add
(
&
distclean_files
,
obj_dir_path
(
make
,
".gitignore"
));
...
@@ -3339,7 +3340,12 @@ static void output_subdirs( struct makefile *make )
...
@@ -3339,7 +3340,12 @@ static void output_subdirs( struct makefile *make )
strmake
(
"%s.in"
,
output_makefile_name
))));
strmake
(
"%s.in"
,
output_makefile_name
))));
strarray_add
(
&
distclean_files
,
base_dir_path
(
submake
,
output_makefile_name
));
strarray_add
(
&
distclean_files
,
base_dir_path
(
submake
,
output_makefile_name
));
if
(
!
make
->
src_dir
)
strarray_add
(
&
distclean_files
,
base_dir_path
(
submake
,
".gitignore"
));
if
(
!
make
->
src_dir
)
strarray_add
(
&
distclean_files
,
base_dir_path
(
submake
,
".gitignore"
));
if
(
submake
->
testdll
)
strarray_add
(
&
distclean_files
,
base_dir_path
(
submake
,
"testlist.c"
));
if
(
submake
->
testdll
)
{
for
(
j
=
0
;
j
<
submake
->
ok_files
.
count
;
j
++
)
strarray_add
(
&
testclean_files
,
base_dir_path
(
submake
,
submake
->
ok_files
.
str
[
j
]
));
strarray_add
(
&
distclean_files
,
base_dir_path
(
submake
,
"testlist.c"
));
}
strarray_addall
(
&
build_deps
,
output_importlib_symlinks
(
make
,
submake
));
strarray_addall
(
&
build_deps
,
output_importlib_symlinks
(
make
,
submake
));
}
}
output
(
"Makefile:"
);
output
(
"Makefile:"
);
...
@@ -3347,9 +3353,12 @@ static void output_subdirs( struct makefile *make )
...
@@ -3347,9 +3353,12 @@ static void output_subdirs( struct makefile *make )
output
(
"
\n
"
);
output
(
"
\n
"
);
output_filenames
(
makefile_deps
);
output_filenames
(
makefile_deps
);
output
(
":
\n
"
);
output
(
":
\n
"
);
output
(
"testclean::
\n
"
);
output_rm_filenames
(
testclean_files
);
output
(
"distclean::
\n
"
);
output
(
"distclean::
\n
"
);
output_rm_filenames
(
distclean_files
);
output_rm_filenames
(
distclean_files
);
strarray_add
(
&
make
->
phony_targets
,
"distclean"
);
strarray_add
(
&
make
->
phony_targets
,
"distclean"
);
strarray_add
(
&
make
->
phony_targets
,
"testclean"
);
if
(
build_deps
.
count
)
if
(
build_deps
.
count
)
{
{
...
...
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