Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
a6fd273a
Commit
a6fd273a
authored
11 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Generate rules from makedep for running tests.
parent
29d08186
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Make.rules.in
+1
-9
1 addition, 9 deletions
Make.rules.in
Makefile.in
+1
-1
1 addition, 1 deletion
Makefile.in
configure
+1
-3
1 addition, 3 deletions
configure
configure.ac
+1
-3
1 addition, 3 deletions
configure.ac
tools/makedep.c
+26
-9
26 additions, 9 deletions
tools/makedep.c
with
30 additions
and
25 deletions
Make.rules.in
+
1
−
9
View file @
a6fd273a
...
...
@@ -32,10 +32,7 @@ ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS)
# Implicit rules
.SUFFIXES: .ok .man.in .man @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp
.c.ok:
$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
.SUFFIXES: .man.in .man @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp
.sfd.ttf:
$(FONTFORGE) -script $(top_srcdir)/fonts/genttf.ff $< $@
...
...
@@ -106,11 +103,6 @@ $(CROSSTESTMODULE): $(CROSSOBJS) Makefile.in
$(WINETEST_RES): $(TESTMODULE_STRIPPED)
echo "$(TESTMODULE) TESTRES \"$(TESTMODULE_STRIPPED)\"" | $(WRC) $(RCFLAGS) -o $@
testclean::
$(RM) *.ok
.PHONY: check test testclean
# Rules for man pages
MANPAGES = $(MANPAGE) $(EXTRA_MANPAGES)
...
...
This diff is collapsed.
Click to expand it.
Makefile.in
+
1
−
1
View file @
a6fd273a
...
...
@@ -58,7 +58,7 @@ uninstall:: __uninstall__
# dependencies needed to build any dll or program
__tooldeps__
:
libs/port libs/wine libs/wpp
__builddeps__
:
__tooldeps__ include
.PHONY
:
test
crosstest __tooldeps__ __builddeps__
.PHONY
:
check test testclean
crosstest __tooldeps__ __builddeps__
loader server
:
libs/port libs/wine tools
fonts
:
tools
...
...
This diff is collapsed.
Click to expand it.
configure
+
1
−
3
View file @
a6fd273a
...
...
@@ -16161,9 +16161,7 @@ all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES)
\$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT)
check test: \$(C_SRCS:.c=.ok)
.PHONY: check test crosstest
.PHONY: check test testclean crosstest
"
if test -n "$CROSSTARGET"
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
1
−
3
View file @
a6fd273a
...
...
@@ -2647,9 +2647,7 @@ all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES)
\$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT)
check test: \$(C_SRCS:.c=.ok)
.PHONY: check test crosstest
.PHONY: check test testclean crosstest
")
if test -n "$CROSSTARGET"
then
...
...
This diff is collapsed.
Click to expand it.
tools/makedep.c
+
26
−
9
View file @
a6fd273a
...
...
@@ -1149,6 +1149,7 @@ static void output_sources(void)
struct
incl_file
*
source
;
struct
strarray
clean_files
;
int
i
,
column
,
po_srcs
=
0
,
mc_srcs
=
0
;
int
is_test
=
find_src_file
(
"testlist.o"
)
!=
NULL
;
strarray_init
(
&
clean_files
);
...
...
@@ -1247,12 +1248,12 @@ static void output_sources(void)
}
else
{
struct
object_extension
*
ext
;
LIST_FOR_EACH_ENTRY
(
ext
,
&
object_extensions
,
struct
object_extension
,
entry
)
struct
object_extension
*
obj_
ext
;
LIST_FOR_EACH_ENTRY
(
obj_
ext
,
&
object_extensions
,
struct
object_extension
,
entry
)
{
strarray_add
(
&
clean_files
,
strmake
(
"%s.%s"
,
obj
,
ext
->
extension
));
output
(
"%s.%s: %s
\n
"
,
obj
,
ext
->
extension
,
source
->
filename
);
if
(
strstr
(
ext
->
extension
,
"cross"
))
strarray_add
(
&
clean_files
,
strmake
(
"%s.%s"
,
obj
,
obj_
ext
->
extension
));
output
(
"%s.%s: %s
\n
"
,
obj
,
obj_
ext
->
extension
,
source
->
filename
);
if
(
strstr
(
obj_
ext
->
extension
,
"cross"
))
output
(
"
\t
$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s
\n
"
,
source
->
filename
);
else
output
(
"
\t
$(CC) -c $(ALLCFLAGS) -o $@ %s
\n
"
,
source
->
filename
);
...
...
@@ -1263,8 +1264,13 @@ static void output_sources(void)
output
(
"%s.cross.o: %s
\n
"
,
obj
,
source
->
filename
);
output
(
"
\t
$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s
\n
"
,
source
->
filename
);
}
LIST_FOR_EACH_ENTRY
(
ext
,
&
object_extensions
,
struct
object_extension
,
entry
)
column
+=
output
(
"%s.%s "
,
obj
,
ext
->
extension
);
if
(
is_test
&&
!
strcmp
(
ext
,
"c"
)
&&
!
is_generated_idl
(
source
))
{
output
(
"%s.ok:
\n
"
,
obj
);
output
(
"
\t
$(RUNTEST) $(RUNTESTFLAGS) %s && touch $@
\n
"
,
obj
);
}
LIST_FOR_EACH_ENTRY
(
obj_ext
,
&
object_extensions
,
struct
object_extension
,
entry
)
column
+=
output
(
"%s.%s "
,
obj
,
obj_ext
->
extension
);
if
(
source
->
flags
&
FLAG_C_IMPLIB
)
column
+=
output
(
"%s.cross.o"
,
obj
);
column
+=
output
(
":"
);
}
...
...
@@ -1313,13 +1319,24 @@ static void output_sources(void)
strarray_add
(
&
clean_files
,
"dlldata.c"
);
}
if
(
find_src_file
(
"testlist.o"
)
)
if
(
is_test
)
{
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_filename
(
source
->
name
,
&
column
);
output
(
"
\n
"
);
column
=
output
(
"check test:"
);
LIST_FOR_EACH_ENTRY
(
source
,
&
sources
,
struct
incl_file
,
entry
)
if
(
strendswith
(
source
->
name
,
".c"
)
&&
!
is_generated_idl
(
source
))
output_filename
(
replace_extension
(
source
->
name
,
2
,
".ok"
),
&
column
);
output
(
"
\n
"
);
output
(
"clean testclean::
\n
"
);
column
=
output
(
"
\t
$(RM)"
);
LIST_FOR_EACH_ENTRY
(
source
,
&
sources
,
struct
incl_file
,
entry
)
if
(
strendswith
(
source
->
name
,
".c"
)
&&
!
is_generated_idl
(
source
))
output_filename
(
replace_extension
(
source
->
name
,
2
,
".ok"
),
&
column
);
output
(
"
\n
"
);
strarray_add
(
&
clean_files
,
"testlist.c"
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment