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
Alexey Alyaev
wine
Commits
d5addea2
Commit
d5addea2
authored
15 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Generate the winetest rules from the WINE_CONFIG_TEST macro.
parent
9644d1dc
No related branches found
No related tags found
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
aclocal.m4
+9
-1
9 additions, 1 deletion
aclocal.m4
configure
+639
-19
639 additions, 19 deletions
configure
configure.ac
+2
-18
2 additions, 18 deletions
configure.ac
tools/make_makefiles
+2
-2
2 additions, 2 deletions
tools/make_makefiles
with
652 additions
and
40 deletions
aclocal.m4
+
9
−
1
View file @
d5addea2
...
...
@@ -222,7 +222,15 @@ dnl
dnl Usage: WINE_CONFIG_TEST(dir)
dnl
AC_DEFUN([WINE_CONFIG_TEST],
[WINE_CONFIG_MAKEFILE([$1/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])])
[m4_pushdef([ac_name],m4_bpatsubst([$1],[.*/\(.*\)/tests$],[\1_test]))dnl
ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS
ac_name.exe: \$(TOPOBJDIR)/$1/ac_name.exe$DLLEXT
cp \$(TOPOBJDIR)/$1/ac_name.exe$DLLEXT \$[@] && \$(STRIP) \$[@]
ac_name.rc:
echo \"ac_name.exe TESTRES \\\"ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false)
ac_name.res: ac_name.rc ac_name.exe"
WINE_CONFIG_MAKEFILE([$1/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])dnl
m4_popdef([ac_name])])
dnl **** Create a static lib makefile from config.status ****
dnl
...
...
This diff is collapsed.
Click to expand it.
configure
+
639
−
19
View file @
d5addea2
This diff is collapsed.
Click to expand it.
configure.ac
+
2
−
18
View file @
d5addea2
...
...
@@ -2098,6 +2098,7 @@ AC_SUBST(ALL_MAKERULES,"")
AC_SUBST(ALL_MAKEFILES,"")
AC_SUBST(ALL_SYMLINKS,"")
AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_DLL_DIRS,"")
...
...
@@ -2674,24 +2675,7 @@ WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[
WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools])
dnl Build dependencies for test files compiled into winetest
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
for dir in $ALL_TEST_DIRS
do
if test "$dir" != "\\"
then
testname=`expr $dir : '\(.*\)/tests'`_test
ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS
$testname.exe: \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT)
cp \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) \$@ && \$(STRIP) \$@
$testname.rc:
echo \"$testname.exe TESTRES \\\"$testname.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
$testname.res: $testname.rc $testname.exe"
fi
done
dnl End of auto-generated output commands
dnl Don't install in bin dir for Windows build
test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""
...
...
This diff is collapsed.
Click to expand it.
tools/make_makefiles
+
2
−
2
View file @
d5addea2
...
...
@@ -417,8 +417,8 @@ sub update_makefiles(@)
replace_makefile_variable
(
$file
,
"
RC_SRCS
"
);
}
push
@lines
,
"
\n
dnl
Build dependencies for test files compiled into winetest
\n
";
replace_in_file
(
"
configure.ac
",
'
^WINE_CONFIG_MAKERULES
',
'
^dnl
Build dependencies for test files compiled into winetest
$
',
@lines
);
push
@lines
,
"
dnl
End of auto-generated output commands
\n
";
replace_in_file
(
"
configure.ac
",
'
^WINE_CONFIG_MAKERULES
',
'
^dnl
End of auto-generated output commands\n
$
',
@lines
);
}
...
...
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