makefiles: Generate all the static lib rules inside the corresponding shell function.

aclocal.m4

@@ -164,12 +164,18 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps
 wine_fn_config_lib ()
 {
     ac_name=$[1]
-    wine_fn_append_file ALL_STATIC_LIBS dlls/$ac_name/lib$ac_name.a
+    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 \
-"dlls/$ac_name/__install__ dlls/$ac_name/__install-dev__: dlls/$ac_name
-dlls/$ac_name dlls/$ac_name/lib$ac_name.cross.a: tools/widl tools/winebuild tools/winegcc include
-dlls/$ac_name/lib$ac_name.cross.a: dlls/$ac_name/Makefile dummy
-	@cd dlls/$ac_name && \$(MAKE) lib$ac_name.cross.a"
+"$ac_dir/__install__ $ac_dir/__install-dev__: $ac_dir
+$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
+$ac_dir/__clean__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile
+$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status dlls/Makeimplib.rules \$(MAKEDEP)
+	@./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend"
 }
 
 wine_fn_config_dll ()
@@ -325,8 +331,7 @@ dnl
 dnl Usage: WINE_CONFIG_LIB(name)
 dnl
 AC_DEFUN([WINE_CONFIG_LIB],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
-wine_fn_config_lib $1
-WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makeimplib.rules],[ALL_STATICLIB_DIRS])])
+wine_fn_config_lib $1])
 
 dnl **** Add a message to the list displayed at the end ****
 dnl

configure

@@ -13841,12 +13841,18 @@ $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps
 wine_fn_config_lib ()
 {
     ac_name=$1
-    wine_fn_append_file ALL_STATIC_LIBS dlls/$ac_name/lib$ac_name.a
+    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 \
-"dlls/$ac_name/__install__ dlls/$ac_name/__install-dev__: dlls/$ac_name
-dlls/$ac_name dlls/$ac_name/lib$ac_name.cross.a: tools/widl tools/winebuild tools/winegcc include
-dlls/$ac_name/lib$ac_name.cross.a: dlls/$ac_name/Makefile dummy
-	@cd dlls/$ac_name && \$(MAKE) lib$ac_name.cross.a"
+"$ac_dir/__install__ $ac_dir/__install-dev__: $ac_dir
+$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
+$ac_dir/__clean__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile
+$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status dlls/Makeimplib.rules \$(MAKEDEP)
+	@./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend"
 }
 
 wine_fn_config_dll ()
@@ -13983,9 +13989,6 @@ wine_fn_config_makefile dlls/actxprxy "dlls/Makedll.rules \$(MAKEDEP)"
 test "x$enable_actxprxy" != xno && wine_fn_append_file ALL_DLL_DIRS "dlls/actxprxy"
 
 wine_fn_config_lib adsiid
-wine_fn_config_makefile dlls/adsiid "dlls/Makeimplib.rules \$(MAKEDEP)"
-test "x$enable_adsiid" != xno && wine_fn_append_file ALL_STATICLIB_DIRS "dlls/adsiid"
-
 wine_fn_append_file ALL_IMPORT_LIBS "dlls/advapi32/libadvapi32.$IMPLIBEXT"
 wine_fn_config_dll advapi32 advapi32
 wine_fn_config_makefile dlls/advapi32 "dlls/Makedll.rules \$(MAKEDEP)"
@@ -14524,13 +14527,7 @@ wine_fn_config_makefile dlls/dxdiagn/tests "Maketest.rules \$(MAKEDEP)"
 test "x$enable_tests" != xno && wine_fn_append_file ALL_TEST_DIRS "dlls/dxdiagn/tests"
 
 wine_fn_config_lib dxerr8
-wine_fn_config_makefile dlls/dxerr8 "dlls/Makeimplib.rules \$(MAKEDEP)"
-test "x$enable_dxerr8" != xno && wine_fn_append_file ALL_STATICLIB_DIRS "dlls/dxerr8"
-
 wine_fn_config_lib dxerr9
-wine_fn_config_makefile dlls/dxerr9 "dlls/Makeimplib.rules \$(MAKEDEP)"
-test "x$enable_dxerr9" != xno && wine_fn_append_file ALL_STATICLIB_DIRS "dlls/dxerr9"
-
 wine_fn_append_file ALL_IMPORT_LIBS "dlls/dxgi/libdxgi.$IMPLIBEXT"
 wine_fn_config_dll dxgi dxgi
 wine_fn_config_makefile dlls/dxgi "dlls/Makedll.rules \$(MAKEDEP)"
@@ -14541,9 +14538,6 @@ wine_fn_config_makefile dlls/dxgi/tests "Maketest.rules \$(MAKEDEP)"
 test "x$enable_tests" != xno && wine_fn_append_file ALL_TEST_DIRS "dlls/dxgi/tests"
 
 wine_fn_config_lib dxguid
-wine_fn_config_makefile dlls/dxguid "dlls/Makeimplib.rules \$(MAKEDEP)"
-test "x$enable_dxguid" != xno && wine_fn_append_file ALL_STATICLIB_DIRS "dlls/dxguid"
-
 wine_fn_config_dll faultrep
 wine_fn_config_makefile dlls/faultrep "dlls/Makedll.rules \$(MAKEDEP)"
 test "x$enable_faultrep" != xno && wine_fn_append_file ALL_DLL_DIRS "dlls/faultrep"
@@ -15567,9 +15561,6 @@ wine_fn_config_makefile dlls/stress.dll16 "dlls/Makedll.rules \$(MAKEDEP)"
 test "x$enable_win16" != xno && wine_fn_append_file ALL_DLL_DIRS "dlls/stress.dll16"
 
 wine_fn_config_lib strmiids
-wine_fn_config_makefile dlls/strmiids "dlls/Makeimplib.rules \$(MAKEDEP)"
-test "x$enable_strmiids" != xno && wine_fn_append_file ALL_STATICLIB_DIRS "dlls/strmiids"
-
 wine_fn_config_dll svrapi
 wine_fn_config_makefile dlls/svrapi "dlls/Makedll.rules \$(MAKEDEP)"
 test "x$enable_svrapi" != xno && wine_fn_append_file ALL_DLL_DIRS "dlls/svrapi"
@@ -15675,9 +15666,6 @@ wine_fn_config_makefile dlls/usp10/tests "Maketest.rules \$(MAKEDEP)"
 test "x$enable_tests" != xno && wine_fn_append_file ALL_TEST_DIRS "dlls/usp10/tests"
 
 wine_fn_config_lib uuid
-wine_fn_config_makefile dlls/uuid "dlls/Makeimplib.rules \$(MAKEDEP)"
-test "x$enable_uuid" != xno && wine_fn_append_file ALL_STATICLIB_DIRS "dlls/uuid"
-
 wine_fn_append_file ALL_IMPORT_LIBS "dlls/uxtheme/libuxtheme.$IMPLIBEXT"
 wine_fn_config_dll uxtheme uxtheme
 wine_fn_config_makefile dlls/uxtheme "dlls/Makedll.rules \$(MAKEDEP)"
@@ -15783,9 +15771,6 @@ wine_fn_config_makefile dlls/winecoreaudio.drv "dlls/Makedll.rules \$(MAKEDEP)"
 test "x$enable_winecoreaudio_drv" != xno && wine_fn_append_file ALL_DLL_DIRS "dlls/winecoreaudio.drv"
 
 wine_fn_config_lib winecrt0
-wine_fn_config_makefile dlls/winecrt0 "dlls/Makeimplib.rules \$(MAKEDEP)"
-test "x$enable_winecrt0" != xno && wine_fn_append_file ALL_STATICLIB_DIRS "dlls/winecrt0"
-
 wine_fn_append_file ALL_IMPORT_LIBS "dlls/wined3d/libwined3d.$IMPLIBEXT"
 wine_fn_config_dll wined3d wined3d
 wine_fn_config_makefile dlls/wined3d "dlls/Makedll.rules \$(MAKEDEP)"
@@ -16997,7 +16982,6 @@ do
     "dlls/aclui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/aclui/Makefile" ;;
     "dlls/activeds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/activeds/Makefile" ;;
     "dlls/actxprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/actxprxy/Makefile" ;;
-    "dlls/adsiid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/adsiid/Makefile" ;;
     "dlls/advapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/Makefile" ;;
     "dlls/advapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/tests/Makefile" ;;
     "dlls/advpack/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advpack/Makefile" ;;
@@ -17122,11 +17106,8 @@ do
     "dlls/dwmapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dwmapi/Makefile" ;;
     "dlls/dxdiagn/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxdiagn/Makefile" ;;
     "dlls/dxdiagn/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxdiagn/tests/Makefile" ;;
-    "dlls/dxerr8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr8/Makefile" ;;
-    "dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;;
     "dlls/dxgi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxgi/Makefile" ;;
     "dlls/dxgi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxgi/tests/Makefile" ;;
-    "dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;;
     "dlls/faultrep/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/faultrep/Makefile" ;;
     "dlls/fltlib/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fltlib/Makefile" ;;
     "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;;
@@ -17364,7 +17345,6 @@ do
     "dlls/sti/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sti/tests/Makefile" ;;
     "dlls/storage.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/storage.dll16/Makefile" ;;
     "dlls/stress.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stress.dll16/Makefile" ;;
-    "dlls/strmiids/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/strmiids/Makefile" ;;
     "dlls/svrapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/svrapi/Makefile" ;;
     "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;;
     "dlls/system.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/system.drv16/Makefile" ;;
@@ -17389,7 +17369,6 @@ do
     "dlls/userenv/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/userenv/tests/Makefile" ;;
     "dlls/usp10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usp10/Makefile" ;;
     "dlls/usp10/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usp10/tests/Makefile" ;;
-    "dlls/uuid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/uuid/Makefile" ;;
     "dlls/uxtheme/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/uxtheme/Makefile" ;;
     "dlls/uxtheme/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/uxtheme/tests/Makefile" ;;
     "dlls/vdhcp.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vdhcp.vxd/Makefile" ;;
@@ -17415,7 +17394,6 @@ do
     "dlls/winealsa.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winealsa.drv/Makefile" ;;
     "dlls/wineaudioio.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wineaudioio.drv/Makefile" ;;
     "dlls/winecoreaudio.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winecoreaudio.drv/Makefile" ;;
-    "dlls/winecrt0/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winecrt0/Makefile" ;;
     "dlls/wined3d/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wined3d/Makefile" ;;
     "dlls/wineesd.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wineesd.drv/Makefile" ;;
     "dlls/winejack.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winejack.drv/Makefile" ;;