commit e55ff7fea59c1bb77b2816695dbe840cf3a1a705
author Alexandre Julliard <julliard@winehq.org> Thu Mar 25 11:02:52 2010 +0100
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 25 11:02:52 2010 +0100
tree e5839dfe2f94c5fefe48f8b1b31e15b846e71b0b
parent e7165b3921a38cccf6e6eebbf6d4041423493d5b

makefiles: Output all the import lib dependencies explicitly for each module.

configure

diff --git a/configure b/configure
index 5b48965..11bc7b4 100755
--- a/configure
+++ b/configure
@@ -601,8 +601,6 @@
 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_STATICLIB_DIRS=""
 
-ALL_STATIC_LIBS=""
-
-ALL_IMPORT_LIBS=""
-
 ALL_INSTALL_DIRS=""
 
 ALL_TEST_DIRS=""
@@ -13925,9 +13919,9 @@
     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 @@
 
     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 \$@