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
10e4edd9
Commit
10e4edd9
authored
15 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Build the static libraries directly from the top-level makefile.
parent
b3b81abb
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
Makefile.in
+19
-6
19 additions, 6 deletions
Makefile.in
aclocal.m4
+7
-6
7 additions, 6 deletions
aclocal.m4
configure
+65
-51
65 additions, 51 deletions
configure
configure.ac
+1
-1
1 addition, 1 deletion
configure.ac
dlls/Makefile.in
+6
-8
6 additions, 8 deletions
dlls/Makefile.in
with
98 additions
and
72 deletions
Makefile.in
+
19
−
6
View file @
10e4edd9
...
...
@@ -27,7 +27,8 @@ VPATH = @srcdir@
LIBEXT
=
@LIBEXT@
MODULE
=
none
ALL_TOOL_DIRS
=
@ALL_TOOL_DIRS@
ALL_STATICLIB_DIRS
=
@ALL_STATICLIB_DIRS@
ALL_TOOL_DIRS
=
@ALL_TOOL_DIRS@
# Sub-directories to run make depend/clean into
SUBDIRS
=
\
...
...
@@ -41,10 +42,14 @@ SUBDIRS = \
loader
\
programs
\
server
\
$(
ALL_TOOL_DIRS
)
$(
ALL_TOOL_DIRS
)
\
$(
ALL_STATICLIB_DIRS
)
# Sub-directories to run make install/uninstall into
INSTALLSUBDIRS
=
libs/wine
$(
ALL_TOOL_DIRS
)
@ALL_TOP_DIRS@
INSTALLSUBDIRS
=
@ALL_TOP_DIRS@
\
libs/wine
\
$(
ALL_TOOL_DIRS
)
\
$(
ALL_STATICLIB_DIRS
)
# Sub-directories to run make test into
TESTSUBDIRS
=
dlls
...
...
@@ -79,13 +84,21 @@ include/stamp-h: include/config.h.in config.status
uninstall
::
-
rmdir
$(
DESTDIR
)$(
datadir
)
/wine
# Import libraries
STATIC_LIBS
=
@ALL_STATIC_LIBS@
implib
:
$(ALL_STATICLIB_DIRS)
.PHONY
:
implib
# Dependencies between directories
all
:
$(INSTALLSUBDIRS)
# dependencies needed to build any dll or program
__builddeps__
:
libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) include
.PHONY
:
__builddeps__
__builddeps__
:
libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) include $(ALL_STATICLIB_DIRS)
__buildcrossdeps__
:
libs/port libs/wine $(ALL_TOOL_DIRS) include $(STATIC_LIBS:.a=.cross.a)
.PHONY
:
__builddeps__ __buildcrossdeps__
dlls programs
:
__builddeps__
loader server
:
libs/port libs/wine tools
...
...
@@ -133,7 +146,7 @@ $(MAKEDEP): include/config.h tools/Makefile
# Test rules
$(TESTSUBDIRS
:
%=%/__test__): wine
$(TESTSUBDIRS
:
%=%/__crosstest__): __builddeps__
$(TESTSUBDIRS
:
%=%/__crosstest__): __build
cross
deps__
# Misc rules
...
...
This diff is collapsed.
Click to expand it.
aclocal.m4
+
7
−
6
View file @
10e4edd9
...
...
@@ -240,12 +240,13 @@ dnl Usage: WINE_CONFIG_LIB(name)
dnl
AC_DEFUN([WINE_CONFIG_LIB],
[ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\
$1/lib$1.a"
ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES
$1/lib$1.a: $1
$1/lib$1.cross.a: dummy
@cd $1 && \$(MAKE) lib$1.cross.a"
WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])])
dlls/$1/lib$1.a"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/$1: tools/widl tools/winebuild tools/winegcc include
dlls/$1/__install__ dlls/$1/__install-dev__: dlls/$1
dlls/$1/lib$1.cross.a: dlls/$1/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd dlls/$1 && \$(MAKE) \`basename \$[@]\`"
WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makeimplib.rules],[],[ALL_STATICLIB_DIRS],[enable_$1])])
dnl **** Add a message to the list displayed at the end ****
dnl
...
...
This diff is collapsed.
Click to expand it.
configure
+
65
−
51
View file @
10e4edd9
...
...
@@ -604,7 +604,7 @@ ALL_TEST_DIRS
ALL_IMPORTLIB_RULES
ALL_IMPORT_LIBS
ALL_STATIC_LIBS
ALL_
IMP
LIB_DIRS
ALL_
STATIC
LIB_DIRS
ALL_TOOL_DIRS
ALL_DLL_DIRS
ALL_TOP_DIRS
...
...
@@ -13669,7 +13669,7 @@ ALL_DLL_DIRS=""
ALL_TOOL_DIRS=""
ALL_
IMP
LIB_DIRS=""
ALL_
STATIC
LIB_DIRS=""
ALL_STATIC_LIBS=""
...
...
@@ -13819,16 +13819,18 @@ dlls/actxprxy/Makefile: dlls/actxprxy/Makefile.in dlls/Makedll.rules config.stat
ac_config_files="$ac_config_files dlls/actxprxy/Makefile"
ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\
adsiid/libadsiid.a"
ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES
adsiid/libadsiid.a: adsiid
adsiid/libadsiid.cross.a: dummy
@cd adsiid && \$(MAKE) libadsiid.cross.a"
dlls/adsiid/libadsiid.a"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/adsiid: tools/widl tools/winebuild tools/winegcc include
dlls/adsiid/__install__ dlls/adsiid/__install-dev__: dlls/adsiid
dlls/adsiid/libadsiid.cross.a: dlls/adsiid/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd dlls/adsiid && \$(MAKE) \`basename \$@\`"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/adsiid/Makefile"
test "x$enable_adsiid" != xno && ALL_
IMP
LIB_DIRS="$ALL_
IMP
LIB_DIRS \\
adsiid"
test "x$enable_adsiid" != xno && ALL_
STATIC
LIB_DIRS="$ALL_
STATIC
LIB_DIRS \\
dlls/
adsiid"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
\$(RECURSE_TARGETS:%=dlls/adsiid/%) dlls/adsiid: dlls/adsiid/Makefile \$(MAKEDEP)
dlls/adsiid/Makefile: dlls/adsiid/Makefile.in dlls/Makeimplib.rules config.status"
ac_config_files="$ac_config_files dlls/adsiid/Makefile"
...
...
@@ -15250,30 +15252,34 @@ dlls/dxdiagn/tests/Makefile: dlls/dxdiagn/tests/Makefile.in dlls/Maketest.rules
ac_config_files="$ac_config_files dlls/dxdiagn/tests/Makefile"
ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\
dxerr8/libdxerr8.a"
ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES
dxerr8/libdxerr8.a: dxerr8
dxerr8/libdxerr8.cross.a: dummy
@cd dxerr8 && \$(MAKE) libdxerr8.cross.a"
dlls/dxerr8/libdxerr8.a"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/dxerr8: tools/widl tools/winebuild tools/winegcc include
dlls/dxerr8/__install__ dlls/dxerr8/__install-dev__: dlls/dxerr8
dlls/dxerr8/libdxerr8.cross.a: dlls/dxerr8/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd dlls/dxerr8 && \$(MAKE) \`basename \$@\`"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/dxerr8/Makefile"
test "x$enable_dxerr8" != xno && ALL_
IMP
LIB_DIRS="$ALL_
IMP
LIB_DIRS \\
dxerr8"
test "x$enable_dxerr8" != xno && ALL_
STATIC
LIB_DIRS="$ALL_
STATIC
LIB_DIRS \\
dlls/
dxerr8"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
\$(RECURSE_TARGETS:%=dlls/dxerr8/%) dlls/dxerr8: dlls/dxerr8/Makefile \$(MAKEDEP)
dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules config.status"
ac_config_files="$ac_config_files dlls/dxerr8/Makefile"
ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\
dxerr9/libdxerr9.a"
ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES
dxerr9/libdxerr9.a: dxerr9
dxerr9/libdxerr9.cross.a: dummy
@cd dxerr9 && \$(MAKE) libdxerr9.cross.a"
dlls/dxerr9/libdxerr9.a"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/dxerr9: tools/widl tools/winebuild tools/winegcc include
dlls/dxerr9/__install__ dlls/dxerr9/__install-dev__: dlls/dxerr9
dlls/dxerr9/libdxerr9.cross.a: dlls/dxerr9/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd dlls/dxerr9 && \$(MAKE) \`basename \$@\`"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/dxerr9/Makefile"
test "x$enable_dxerr9" != xno && ALL_
IMP
LIB_DIRS="$ALL_
IMP
LIB_DIRS \\
dxerr9"
test "x$enable_dxerr9" != xno && ALL_
STATIC
LIB_DIRS="$ALL_
STATIC
LIB_DIRS \\
dlls/
dxerr9"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
\$(RECURSE_TARGETS:%=dlls/dxerr9/%) dlls/dxerr9: dlls/dxerr9/Makefile \$(MAKEDEP)
dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules config.status"
ac_config_files="$ac_config_files dlls/dxerr9/Makefile"
...
...
@@ -15307,16 +15313,18 @@ dlls/dxgi/tests/Makefile: dlls/dxgi/tests/Makefile.in dlls/Maketest.rules config
ac_config_files="$ac_config_files dlls/dxgi/tests/Makefile"
ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\
dxguid/libdxguid.a"
ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES
dxguid/libdxguid.a: dxguid
dxguid/libdxguid.cross.a: dummy
@cd dxguid && \$(MAKE) libdxguid.cross.a"
dlls/dxguid/libdxguid.a"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/dxguid: tools/widl tools/winebuild tools/winegcc include
dlls/dxguid/__install__ dlls/dxguid/__install-dev__: dlls/dxguid
dlls/dxguid/libdxguid.cross.a: dlls/dxguid/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd dlls/dxguid && \$(MAKE) \`basename \$@\`"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/dxguid/Makefile"
test "x$enable_dxguid" != xno && ALL_
IMP
LIB_DIRS="$ALL_
IMP
LIB_DIRS \\
dxguid"
test "x$enable_dxguid" != xno && ALL_
STATIC
LIB_DIRS="$ALL_
STATIC
LIB_DIRS \\
dlls/
dxguid"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
\$(RECURSE_TARGETS:%=dlls/dxguid/%) dlls/dxguid: dlls/dxguid/Makefile \$(MAKEDEP)
dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules config.status"
ac_config_files="$ac_config_files dlls/dxguid/Makefile"
...
...
@@ -18029,16 +18037,18 @@ dlls/stress.dll16/Makefile: dlls/stress.dll16/Makefile.in dlls/Makedll.rules con
ac_config_files="$ac_config_files dlls/stress.dll16/Makefile"
ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\
strmiids/libstrmiids.a"
ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES
strmiids/libstrmiids.a: strmiids
strmiids/libstrmiids.cross.a: dummy
@cd strmiids && \$(MAKE) libstrmiids.cross.a"
dlls/strmiids/libstrmiids.a"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/strmiids: tools/widl tools/winebuild tools/winegcc include
dlls/strmiids/__install__ dlls/strmiids/__install-dev__: dlls/strmiids
dlls/strmiids/libstrmiids.cross.a: dlls/strmiids/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd dlls/strmiids && \$(MAKE) \`basename \$@\`"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/strmiids/Makefile"
test "x$enable_strmiids" != xno && ALL_
IMP
LIB_DIRS="$ALL_
IMP
LIB_DIRS \\
strmiids"
test "x$enable_strmiids" != xno && ALL_
STATIC
LIB_DIRS="$ALL_
STATIC
LIB_DIRS \\
dlls/
strmiids"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
\$(RECURSE_TARGETS:%=dlls/strmiids/%) dlls/strmiids: dlls/strmiids/Makefile \$(MAKEDEP)
dlls/strmiids/Makefile: dlls/strmiids/Makefile.in dlls/Makeimplib.rules config.status"
ac_config_files="$ac_config_files dlls/strmiids/Makefile"
...
...
@@ -18302,16 +18312,18 @@ dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules conf
ac_config_files="$ac_config_files dlls/usp10/tests/Makefile"
ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\
uuid/libuuid.a"
ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES
uuid/libuuid.a: uuid
uuid/libuuid.cross.a: dummy
@cd uuid && \$(MAKE) libuuid.cross.a"
dlls/uuid/libuuid.a"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/uuid: tools/widl tools/winebuild tools/winegcc include
dlls/uuid/__install__ dlls/uuid/__install-dev__: dlls/uuid
dlls/uuid/libuuid.cross.a: dlls/uuid/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd dlls/uuid && \$(MAKE) \`basename \$@\`"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/uuid/Makefile"
test "x$enable_uuid" != xno && ALL_
IMP
LIB_DIRS="$ALL_
IMP
LIB_DIRS \\
uuid"
test "x$enable_uuid" != xno && ALL_
STATIC
LIB_DIRS="$ALL_
STATIC
LIB_DIRS \\
dlls/
uuid"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
\$(RECURSE_TARGETS:%=dlls/uuid/%) dlls/uuid: dlls/uuid/Makefile \$(MAKEDEP)
dlls/uuid/Makefile: dlls/uuid/Makefile.in dlls/Makeimplib.rules config.status"
ac_config_files="$ac_config_files dlls/uuid/Makefile"
...
...
@@ -18560,16 +18572,18 @@ dlls/winecoreaudio.drv/Makefile: dlls/winecoreaudio.drv/Makefile.in dlls/Makedll
ac_config_files="$ac_config_files dlls/winecoreaudio.drv/Makefile"
ALL_STATIC_LIBS="$ALL_STATIC_LIBS \\
winecrt0/libwinecrt0.a"
ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES
winecrt0/libwinecrt0.a: winecrt0
winecrt0/libwinecrt0.cross.a: dummy
@cd winecrt0 && \$(MAKE) libwinecrt0.cross.a"
dlls/winecrt0/libwinecrt0.a"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/winecrt0: tools/widl tools/winebuild tools/winegcc include
dlls/winecrt0/__install__ dlls/winecrt0/__install-dev__: dlls/winecrt0
dlls/winecrt0/libwinecrt0.cross.a: dlls/winecrt0/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd dlls/winecrt0 && \$(MAKE) \`basename \$@\`"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/winecrt0/Makefile"
test "x$enable_winecrt0" != xno && ALL_
IMP
LIB_DIRS="$ALL_
IMP
LIB_DIRS \\
winecrt0"
test "x$enable_winecrt0" != xno && ALL_
STATIC
LIB_DIRS="$ALL_
STATIC
LIB_DIRS \\
dlls/
winecrt0"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
\$(RECURSE_TARGETS:%=dlls/winecrt0/%) dlls/winecrt0: dlls/winecrt0/Makefile \$(MAKEDEP)
dlls/winecrt0/Makefile: dlls/winecrt0/Makefile.in dlls/Makeimplib.rules config.status"
ac_config_files="$ac_config_files dlls/winecrt0/Makefile"
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
1
−
1
View file @
10e4edd9
...
...
@@ -2103,7 +2103,7 @@ AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_DLL_DIRS,"")
AC_SUBST(ALL_TOOL_DIRS,"")
AC_SUBST(ALL_
IMP
LIB_DIRS,"")
AC_SUBST(ALL_
STATIC
LIB_DIRS,"")
AC_SUBST(ALL_STATIC_LIBS,"")
AC_SUBST(ALL_IMPORT_LIBS,"")
AC_SUBST(ALL_IMPORTLIB_RULES,"")
...
...
This diff is collapsed.
Click to expand it.
dlls/Makefile.in
+
6
−
8
View file @
10e4edd9
...
...
@@ -6,11 +6,10 @@ VPATH = @srcdir@
INSTALLDIRS
=
$(
DESTDIR
)$(
dlldir
)
DLLSUBDIRS
=
@ALL_DLL_DIRS@
IMPLIBSUBDIRS
=
@ALL_IMPLIB_DIRS@
TESTSUBDIRS
=
@ALL_TEST_DIRS@
SUBDIRS
=
$(
DLLSUBDIRS
)
$(
IMPLIBSUBDIRS
)
$(
TESTSUBDIRS
)
SUBDIRS
=
$(
DLLSUBDIRS
)
$(
TESTSUBDIRS
)
BUILDSUBDIRS
=
$(
DLLSUBDIRS
)
$(
TESTSUBDIRS
)
INSTALLSUBDIRS
=
$(
DLLSUBDIRS
)
$(
IMPLIBSUBDIRS
)
INSTALLSUBDIRS
=
$(
DLLSUBDIRS
)
DOCSUBDIRS
=
$(
DLLSUBDIRS
)
@MAKE_RULES@
...
...
@@ -21,19 +20,18 @@ all: $(BUILDSUBDIRS)
# Import libraries
STATIC_LIBS
=
@ALL_STATIC_LIBS@
IMPORT_LIBS
=
@ALL_IMPORT_LIBS@
$(TESTSUBDIRS
:
%=%/__crosstest__):
$(STATIC_LIBS:.a=.cross.a)
$(IMPORT_LIBS:.def=.cross.a)
$(TESTSUBDIRS
:
%=%/__crosstest__): $(IMPORT_LIBS:.def=.cross.a)
implib
:
$(STATIC_LIBS)
$(IMPORT_LIBS)
implib
:
$(IMPORT_LIBS)
testsubdirs
:
$(TESTSUBDIRS)
.PHONY
:
implib testsubdirs
$(BUILDSUBDIRS)
:
$(STATIC_LIBS)
$(IMPORT_LIBS)
$(INSTALLSUBDIRS
:
%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__):
$(STATIC_LIBS)
$(IMPORT_LIBS)
$(BUILDSUBDIRS)
:
$(IMPORT_LIBS)
$(INSTALLSUBDIRS
:
%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPORT_LIBS)
@ALL_IMPORTLIB_RULES@
...
...
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