From e55ff7fea59c1bb77b2816695dbe840cf3a1a705 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 25 Mar 2010 11:02:52 +0100
Subject: [PATCH] makefiles: Output all the import lib dependencies explicitly
 for each module.

---
 Makefile.in | 11 +----------
 aclocal.m4  | 23 +++++++++++------------
 configure   | 27 +++++++++++----------------
 3 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 2768b176e54..4fd69e14d4c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -183,20 +183,11 @@ manpages htmlpages sgmlpages xmlpages: dummy
 .PHONY: man doc-html doc-sgml doc-xml manpages htmlpages sgmlpages xmlpages \
 	$(DOCSUBDIRS:%=%/__man__) $(DOCSUBDIRS:%=%/__doc_html__) $(DOCSUBDIRS:%=%/__doc_sgml__) $(DOCSUBDIRS:%=%/__doc_xml__)
 
-# Rules for import libraries
-
-STATIC_LIBS = @ALL_STATIC_LIBS@
-IMPORT_LIBS = @ALL_IMPORT_LIBS@
-
-implib: $(ALL_STATICLIB_DIRS) $(IMPORT_LIBS)
-.PHONY: implib
-
 # Dependencies between directories
 
 # dependencies needed to build any dll or program
 __tooldeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS)
-__builddeps__: __tooldeps__ include $(ALL_STATICLIB_DIRS) $(IMPORT_LIBS)
-__buildcrossdeps__: __tooldeps__ include $(STATIC_LIBS:.a=.cross.a) $(IMPORT_LIBS:.def=.cross.a)
+__builddeps__ __buildcrossdeps__: __tooldeps__ include
 .PHONY: __tooldeps__ __builddeps__ __buildcrossdeps__
 
 loader server: libs/port libs/wine tools
diff --git a/aclocal.m4 b/aclocal.m4
index 060767aa28d..c5521da2112 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -151,8 +151,6 @@ AC_SUBST(ALL_TOP_DIRS,"")
 AC_SUBST(ALL_DLL_DIRS,"")
 AC_SUBST(ALL_TOOL_DIRS,"")
 AC_SUBST(ALL_STATICLIB_DIRS,"")
-AC_SUBST(ALL_STATIC_LIBS,"")
-AC_SUBST(ALL_IMPORT_LIBS,"")
 AC_SUBST(ALL_INSTALL_DIRS,"")
 AC_SUBST(ALL_TEST_DIRS,"")
 AC_SUBST(ALL_TEST_BINARIES,"")
@@ -190,9 +188,9 @@ wine_fn_config_lib ()
     ac_dir=dlls/$ac_name
     wine_fn_append_file ALL_DIRS $ac_dir
     wine_fn_append_file ALL_STATICLIB_DIRS $ac_dir
-    wine_fn_append_file ALL_STATIC_LIBS $ac_dir/lib$ac_name.a
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"$ac_dir/__install__ $ac_dir/__install-dev__: $ac_dir
+"$ac_dir/__install__ $ac_dir/__install-dev__ __builddeps__: $ac_dir
+__buildcrossdeps__: $ac_dir/lib$ac_name.cross.a
 $ac_dir $ac_dir/lib$ac_name.cross.a: tools/widl tools/winebuild tools/winegcc include
 $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile dummy
 	@cd $ac_dir && \$(MAKE) lib$ac_name.cross.a
@@ -223,27 +221,28 @@ dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.s
 
     if test -n "$ac_implibsrc"
     then
-        wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$IMPLIBEXT
-        wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$STATIC_IMPLIBEXT
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
+"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT
+__buildcrossdeps__: $ac_file.cross.a
+$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
 $ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile
 	@cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`
 $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/Makefile dummy
 	@cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`"
     elif test -n "$ac_implib"
     then
-        wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$IMPLIBEXT
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"$ac_file.$IMPLIBEXT $ac_file.cross.a: $ac_deps
-$ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile
+"__builddeps__: $ac_file.$IMPLIBEXT
+__buildcrossdeps__: $ac_file.cross.a
+$ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
 	@cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`"
 
         if test "$ac_dir" != "$ac_implib"
         then
-            wine_fn_append_file ALL_IMPORT_LIBS dlls/lib$ac_implib.$IMPLIBEXT
             wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
+"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT
+__buildcrossdeps__: dlls/lib$ac_implib.cross.a
+dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
 	\$(RM) \$[@] && \$(LN_S) $ac_dir/lib$ac_implib.$IMPLIBEXT \$[@]
 dlls/lib$ac_implib.cross.a: $ac_file.cross.a
 	\$(RM) \$[@] && \$(LN_S) $ac_dir/lib$ac_implib.cross.a \$[@]
diff --git a/configure b/configure
index 5b48965e10a..11bc7b498ca 100755
--- a/configure
+++ b/configure
@@ -601,8 +601,6 @@ ALL_PROGRAM_DIRS
 ALL_TEST_BINARIES
 ALL_TEST_DIRS
 ALL_INSTALL_DIRS
-ALL_IMPORT_LIBS
-ALL_STATIC_LIBS
 ALL_STATICLIB_DIRS
 ALL_TOOL_DIRS
 ALL_DLL_DIRS
@@ -13874,10 +13872,6 @@ ALL_TOOL_DIRS=""
 
 ALL_STATICLIB_DIRS=""
 
-ALL_STATIC_LIBS=""
-
-ALL_IMPORT_LIBS=""
-
 ALL_INSTALL_DIRS=""
 
 ALL_TEST_DIRS=""
@@ -13925,9 +13919,9 @@ wine_fn_config_lib ()
     ac_dir=dlls/$ac_name
     wine_fn_append_file ALL_DIRS $ac_dir
     wine_fn_append_file ALL_STATICLIB_DIRS $ac_dir
-    wine_fn_append_file ALL_STATIC_LIBS $ac_dir/lib$ac_name.a
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"$ac_dir/__install__ $ac_dir/__install-dev__: $ac_dir
+"$ac_dir/__install__ $ac_dir/__install-dev__ __builddeps__: $ac_dir
+__buildcrossdeps__: $ac_dir/lib$ac_name.cross.a
 $ac_dir $ac_dir/lib$ac_name.cross.a: tools/widl tools/winebuild tools/winegcc include
 $ac_dir/lib$ac_name.cross.a: $ac_dir/Makefile dummy
 	@cd $ac_dir && \$(MAKE) lib$ac_name.cross.a
@@ -13960,27 +13954,28 @@ fi
 
     if test -n "$ac_implibsrc"
     then
-        wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$IMPLIBEXT
-        wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$STATIC_IMPLIBEXT
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
+"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT
+__buildcrossdeps__: $ac_file.cross.a
+$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
 $ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile
 	@cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`
 $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/Makefile dummy
 	@cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`"
     elif test -n "$ac_implib"
     then
-        wine_fn_append_file ALL_IMPORT_LIBS $ac_file.$IMPLIBEXT
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"$ac_file.$IMPLIBEXT $ac_file.cross.a: $ac_deps
-$ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile
+"__builddeps__: $ac_file.$IMPLIBEXT
+__buildcrossdeps__: $ac_file.cross.a
+$ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
 	@cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`"
 
         if test "$ac_dir" != "$ac_implib"
         then
-            wine_fn_append_file ALL_IMPORT_LIBS dlls/lib$ac_implib.$IMPLIBEXT
             wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
+"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT
+__buildcrossdeps__: dlls/lib$ac_implib.cross.a
+dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
 	\$(RM) \$@ && \$(LN_S) $ac_dir/lib$ac_implib.$IMPLIBEXT \$@
 dlls/lib$ac_implib.cross.a: $ac_file.cross.a
 	\$(RM) \$@ && \$(LN_S) $ac_dir/lib$ac_implib.cross.a \$@
-- 
2.11.4.GIT