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
2fa7ae05
Commit
2fa7ae05
authored
Mar 04, 2018
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Generate the crosstest disabled rule from makedep.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
84ddddff
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
14 deletions
+7
-14
configure
configure
+0
-3
configure.ac
configure.ac
+0
-4
makedep.c
tools/makedep.c
+7
-7
No files found.
configure
View file @
2fa7ae05
...
...
@@ -18198,9 +18198,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP)
depend:
\$
(MAKEDEP) dummy
\$
(MAKEDEP)"
test
-n
"
$CROSSTARGET
"
||
wine_fn_append_rule
"crosstest:
@echo
\"
crosstest is not supported (mingw not installed?)
\"
&& false"
if
test
"x
$enable_fonts
"
!=
xno
;
then
ac_config_links
=
"
$ac_config_links
fonts/marlett.ttf:fonts/marlett.ttf"
ac_config_links
=
"
$ac_config_links
fonts/symbol.ttf:fonts/symbol.ttf"
...
...
configure.ac
View file @
2fa7ae05
...
...
@@ -2797,10 +2797,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP)
depend: \$(MAKEDEP) dummy
\$(MAKEDEP)])
test -n "$CROSSTARGET" || WINE_APPEND_RULE(
[crosstest:
@echo \"crosstest is not supported (mingw not installed?)\" && false])
WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],enable_fonts)
WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls])
WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper)
...
...
tools/makedep.c
View file @
2fa7ae05
...
...
@@ -3547,13 +3547,13 @@ static void output_subdirs( struct makefile *make )
strarray_add
(
&
make
->
phony_targets
,
"check"
);
strarray_add
(
&
make
->
phony_targets
,
"test"
);
}
if
(
crosstest_deps
.
count
)
{
output
(
"crosstest:
"
);
output_filenames
(
crosstest_deps
);
output
(
"
\n
"
);
strarray_add
(
&
make
->
phony_targets
,
"crosstest"
);
}
output
(
"crosstest:"
);
output_filenames
(
crosstest_deps
);
output
(
"
\n
"
);
if
(
!
crosstest_deps
.
count
)
output
(
"
\
t
@echo
\"
crosstest is not supported (mingw not installed?)
\"
&& false
\
n
"
);
strarray_add
(
&
make
->
phony_targets
,
"crosstest"
);
output
(
"clean::
\n
"
);
output_rm_filenames
(
clean_files
);
output
(
"testclean::
\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