makefiles: Build the static libraries directly from the top-level makefile.
diff --git a/Makefile.in b/Makefile.in
index 2f2c85b..4ae4e83 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,7 +27,8 @@
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 @@
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 @@
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 @@
# Test rules
$(TESTSUBDIRS:%=%/__test__): wine
-$(TESTSUBDIRS:%=%/__crosstest__): __builddeps__
+$(TESTSUBDIRS:%=%/__crosstest__): __buildcrossdeps__
# Misc rules
diff --git a/aclocal.m4 b/aclocal.m4
index d720979..bedb308 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -240,12 +240,13 @@
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
diff --git a/configure b/configure
index 5202f3a..1128d1b 100755
--- a/configure
+++ b/configure
@@ -604,7 +604,7 @@
ALL_IMPORTLIB_RULES
ALL_IMPORT_LIBS
ALL_STATIC_LIBS
-ALL_IMPLIB_DIRS
+ALL_STATICLIB_DIRS
ALL_TOOL_DIRS
ALL_DLL_DIRS
ALL_TOP_DIRS
@@ -13669,7 +13669,7 @@
ALL_TOOL_DIRS=""
-ALL_IMPLIB_DIRS=""
+ALL_STATICLIB_DIRS=""
ALL_STATIC_LIBS=""
@@ -13819,16 +13819,18 @@
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_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
- adsiid"
+test "x$enable_adsiid" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_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 @@
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_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
- dxerr8"
+test "x$enable_dxerr8" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_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_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
- dxerr9"
+test "x$enable_dxerr9" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_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 @@
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_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
- dxguid"
+test "x$enable_dxguid" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_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 @@
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_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
- strmiids"
+test "x$enable_strmiids" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_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 @@
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_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
- uuid"
+test "x$enable_uuid" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_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 @@
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_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
- winecrt0"
+test "x$enable_winecrt0" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_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"
diff --git a/configure.ac b/configure.ac
index f07b764..274a6c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2103,7 +2103,7 @@
AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_DLL_DIRS,"")
AC_SUBST(ALL_TOOL_DIRS,"")
-AC_SUBST(ALL_IMPLIB_DIRS,"")
+AC_SUBST(ALL_STATICLIB_DIRS,"")
AC_SUBST(ALL_STATIC_LIBS,"")
AC_SUBST(ALL_IMPORT_LIBS,"")
AC_SUBST(ALL_IMPORTLIB_RULES,"")
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 2e5117f..df4d7a4 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -6,11 +6,10 @@
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 @@
# 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@
