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
ea9a113a
Commit
ea9a113a
authored
15 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Build the tests directly from the top-level makefile.
parent
86ab297b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile.in
+17
-10
17 additions, 10 deletions
Makefile.in
aclocal.m4
+4
-1
4 additions, 1 deletion
aclocal.m4
configure
+530
-106
530 additions, 106 deletions
configure
dlls/Makefile.in
+2
-3
2 additions, 3 deletions
dlls/Makefile.in
with
553 additions
and
120 deletions
Makefile.in
+
17
−
10
View file @
ea9a113a
...
...
@@ -28,7 +28,9 @@ LIBEXT = @LIBEXT@
MODULE
=
none
ALL_STATICLIB_DIRS
=
@ALL_STATICLIB_DIRS@
ALL_TEST_DIRS
=
@ALL_TEST_DIRS@
ALL_TOOL_DIRS
=
@ALL_TOOL_DIRS@
ALL_TOP_DIRS
=
@ALL_TOP_DIRS@
# Sub-directories to run make depend/clean into
SUBDIRS
=
\
...
...
@@ -43,16 +45,26 @@ SUBDIRS = \
programs
\
server
\
$(
ALL_TOOL_DIRS
)
\
$(
ALL_STATICLIB_DIRS
)
$(
ALL_STATICLIB_DIRS
)
\
$(
ALL_TEST_DIRS
)
# Sub-directories to run make all into
BUILDSUBDIRS
=
\
libs/wine
\
$(
ALL_TOOL_DIRS
)
\
$(
ALL_TOP_DIRS
)
\
$(
ALL_STATICLIB_DIRS
)
\
$(
ALL_TEST_DIRS
)
# Sub-directories to run make install/uninstall into
INSTALLSUBDIRS
=
@ALL_TOP_DIRS@
\
INSTALLSUBDIRS
=
\
libs/wine
\
$(
ALL_TOOL_DIRS
)
\
$(
ALL_TOP_DIRS
)
\
$(
ALL_STATICLIB_DIRS
)
# Sub-directories to run make test into
TESTSUBDIRS
=
dlls
TESTSUBDIRS
=
$(
ALL_TEST_DIRS
)
# Sub-directories that don't have a makefile
EXTRASUBDIRS
=
libs
...
...
@@ -94,7 +106,7 @@ implib: $(ALL_STATICLIB_DIRS) $(IMPORT_LIBS)
# Dependencies between directories
all
:
$(
INSTALL
SUBDIRS)
all
:
$(
BUILD
SUBDIRS)
# dependencies needed to build any dll or program
__builddeps__
:
libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) include $(ALL_STATICLIB_DIRS) $(IMPORT_LIBS)
...
...
@@ -105,7 +117,7 @@ dlls programs: __builddeps__
loader server
:
libs/port libs/wine tools
fonts
:
tools
include
:
tools/widl
programs
:
dlls
programs
:
$(ALL_TEST_DIRS)
libs/wine $(ALL_TOOL_DIRS)
:
libs/port
tools/wmc tools/wrc
:
tools
tools tools/wmc tools/wrc
:
libs/wine
...
...
@@ -142,11 +154,6 @@ depend: $(MAKEDEP)
$(MAKEDEP)
:
include/config.h tools/Makefile
@
cd
$(
TOOLSDIR
)
/tools
&&
$(
MAKE
)
makedep
$(
TOOLSEXT
)
# Test rules
$(TESTSUBDIRS
:
%=%/__test__): wine
$(TESTSUBDIRS
:
%=%/__crosstest__): __buildcrossdeps__
# Misc rules
TAGS etags
:
...
...
This diff is collapsed.
Click to expand it.
aclocal.m4
+
4
−
1
View file @
ea9a113a
...
...
@@ -224,6 +224,9 @@ dnl Usage: WINE_CONFIG_TEST(dir)
dnl
AC_DEFUN([WINE_CONFIG_TEST],
[m4_pushdef([ac_name],m4_bpatsubst([$1],[.*/\(.*\)/tests$],[\1_test]))dnl
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
$1: __builddeps__
$1/__crosstest__: __buildcrossdeps__"
ALL_TEST_BINARIES="$ALL_TEST_BINARIES \\
ac_name.exe"
ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS
...
...
@@ -232,7 +235,7 @@ ac_name.exe: \$(TOPOBJDIR)/$1/ac_name.exe$DLLEXT
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
WINE_CONFIG_MAKEFILE([$1/Makefile],[dlls/Maketest.rules],[],[ALL_TEST_DIRS],[enable_tests])dnl
m4_popdef([ac_name])])
dnl **** Create a static lib makefile from config.status ****
...
...
This diff is collapsed.
Click to expand it.
configure
+
530
−
106
View file @
ea9a113a
This diff is collapsed.
Click to expand it.
dlls/Makefile.in
+
2
−
3
View file @
ea9a113a
...
...
@@ -6,9 +6,8 @@ VPATH = @srcdir@
INSTALLDIRS
=
$(
DESTDIR
)$(
dlldir
)
DLLSUBDIRS
=
@ALL_DLL_DIRS@
TESTSUBDIRS
=
@ALL_TEST_DIRS@
SUBDIRS
=
$(
DLLSUBDIRS
)
$(
TESTSUBDIRS
)
BUILDSUBDIRS
=
$(
DLLSUBDIRS
)
$(
TESTSUBDIRS
)
SUBDIRS
=
$(
DLLSUBDIRS
)
BUILDSUBDIRS
=
$(
DLLSUBDIRS
)
INSTALLSUBDIRS
=
$(
DLLSUBDIRS
)
DOCSUBDIRS
=
$(
DLLSUBDIRS
)
...
...
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