Alexandre Julliard : makefiles: Simplify the WINE_CONFIG_DLL macro by defining some local variables.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3be8b409ae360e87fed6795616a6c9904da17471
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3be8b409ae360e87fed6795616...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Feb 10 19:39:38 2010 +0100

makefiles: Simplify the WINE_CONFIG_DLL macro by defining some local variables.

---

 aclocal.m4 |   40 +++++++++++++++++++++++-----------------
 configure  |   32 ++++++++++++--------------------
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 62f73da..d7b41c1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -188,30 +188,36 @@ dnl
 dnl Usage: WINE_CONFIG_DLL(name,enable,implib,implibsrc)
 dnl
 AC_DEFUN([WINE_CONFIG_DLL],
-[m4_ifval([$3],[m4_ifval([$2],[test "x$[$2]" = xno || ])ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\
-	dlls/$1/lib$3.$IMPLIBEXT[]dnl
-m4_if($1,$3,,[ \\
-	dlls/lib$3.$IMPLIBEXT])[]dnl
-m4_ifval([$4],[ \\
-	dlls/$1/lib$3.$STATIC_IMPLIBEXT])"
+[m4_pushdef([ac_implib],m4_ifval([$3],[dlls/$1/lib$3.$IMPLIBEXT]))dnl
+m4_pushdef([ac_crosslib],m4_ifval([$3],[dlls/$1/lib$3.cross.a]))dnl
+m4_pushdef([ac_staticlib],m4_ifval([$4],[dlls/$1/lib$3.$STATIC_IMPLIBEXT]))dnl
+m4_pushdef([ac_symlink],m4_if([$1],[$3],,[dlls/lib$3.$IMPLIBEXT]))dnl
+m4_ifval(ac_implib,[m4_ifval([$2],[test "x$[$2]" = xno || ])ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\
+	ac_implib[]dnl
+m4_ifval(ac_symlink,[ \\
+	ac_symlink])[]dnl
+m4_ifval(ac_staticlib,[ \\
+	ac_staticlib])"
 ])ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
-m4_ifval([$3],[dlls/$1/lib$3.$IMPLIBEXT m4_ifval([$4],[dlls/$1/lib$3.$STATIC_IMPLIBEXT ])dlls/$1/lib$3.cross.a: tools/widl tools/winebuild tools/winegcc include
-m4_if($1,$3,,[dlls/lib$3.a: dlls/$1/lib$3.a
-	\$(RM) \$[@] && \$(LN_S) $1/lib$3.a \$[@]
-dlls/lib$3.cross.a: dlls/$1/lib$3.cross.a
+m4_ifval(ac_implib,[ac_implib m4_ifval(ac_staticlib,[ac_staticlib ])ac_crosslib: tools/widl tools/winebuild tools/winegcc include
+m4_ifval(ac_symlink,[ac_symlink: ac_implib
+	\$(RM) \$[@] && \$(LN_S) $1/lib$3.$IMPLIBEXT \$[@]
+dlls/lib$3.cross.a: ac_crosslib
 	\$(RM) \$[@] && \$(LN_S) $1/lib$3.cross.a \$[@]
-dlls/lib$3.def: dlls/$1/lib$3.def
-	\$(RM) \$[@] && \$(LN_S) $1/lib$3.def \$[@]
 clean::
-	\$(RM) dlls/lib$3.def
-])m4_ifval([$4],[dlls/$1/lib$3.def: dlls/$1/$1.spec dlls/$1/Makefile
+	\$(RM) ac_symlink
+])m4_ifval(ac_staticlib,[dlls/$1/lib$3.def: dlls/$1/$1.spec dlls/$1/Makefile
 	@cd dlls/$1 && \$(MAKE) \`basename \$[@]\`
-dlls/$1/lib$3.$STATIC_IMPLIBEXT dlls/$1/lib$3.cross.a: dlls/$1/Makefile dummy
+ac_staticlib ac_crosslib: dlls/$1/Makefile dummy
 	@cd dlls/$1 && \$(MAKE) \`basename \$[@]\`],
-[dlls/$1/lib$3.$IMPLIBEXT dlls/$1/lib$3.cross.a: dlls/$1/$1.spec dlls/$1/Makefile
+[ac_implib ac_crosslib: dlls/$1/$1.spec dlls/$1/Makefile
 	@cd dlls/$1 && \$(MAKE) \`basename \$[@]\`])
 ])dlls/$1 dlls/$1/__install__ dlls/$1/__install-lib__ dlls/$1/__install-dev__: __builddeps__"
-WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makedll.rules],[ALL_DLL_DIRS],[$2])])
+WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makedll.rules],[ALL_DLL_DIRS],[$2])dnl
+m4_popdef([ac_implib])dnl
+m4_popdef([ac_crosslib])dnl
+m4_popdef([ac_staticlib])dnl
+m4_popdef([ac_symlink])])
 
 dnl **** Create a program makefile from config.status ****
 dnl
diff --git a/configure b/configure
index ac049b5..1062066 100755
--- a/configure
+++ b/configure
@@ -14919,14 +14919,12 @@ ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\
 	dlls/libd3dx9.$IMPLIBEXT"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_36/libd3dx9.$IMPLIBEXT dlls/d3dx9_36/libd3dx9.cross.a: tools/widl tools/winebuild tools/winegcc include
-dlls/libd3dx9.a: dlls/d3dx9_36/libd3dx9.a
-	\$(RM) \$@ && \$(LN_S) d3dx9_36/libd3dx9.a \$@
+dlls/libd3dx9.$IMPLIBEXT: dlls/d3dx9_36/libd3dx9.$IMPLIBEXT
+	\$(RM) \$@ && \$(LN_S) d3dx9_36/libd3dx9.$IMPLIBEXT \$@
 dlls/libd3dx9.cross.a: dlls/d3dx9_36/libd3dx9.cross.a
 	\$(RM) \$@ && \$(LN_S) d3dx9_36/libd3dx9.cross.a \$@
-dlls/libd3dx9.def: dlls/d3dx9_36/libd3dx9.def
-	\$(RM) \$@ && \$(LN_S) d3dx9_36/libd3dx9.def \$@
 clean::
-	\$(RM) dlls/libd3dx9.def
+	\$(RM) dlls/libd3dx9.$IMPLIBEXT
 dlls/d3dx9_36/libd3dx9.$IMPLIBEXT dlls/d3dx9_36/libd3dx9.cross.a: dlls/d3dx9_36/d3dx9_36.spec dlls/d3dx9_36/Makefile
 	@cd dlls/d3dx9_36 && \$(MAKE) \`basename \$@\`
 dlls/d3dx9_36 dlls/d3dx9_36/__install__ dlls/d3dx9_36/__install-lib__ dlls/d3dx9_36/__install-dev__: __builddeps__"
@@ -16431,14 +16429,12 @@ test "x$enable_win16" = xno || ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\
 	dlls/libkernel.$IMPLIBEXT"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/krnl386.exe16/libkernel.$IMPLIBEXT dlls/krnl386.exe16/libkernel.cross.a: tools/widl tools/winebuild tools/winegcc include
-dlls/libkernel.a: dlls/krnl386.exe16/libkernel.a
-	\$(RM) \$@ && \$(LN_S) krnl386.exe16/libkernel.a \$@
+dlls/libkernel.$IMPLIBEXT: dlls/krnl386.exe16/libkernel.$IMPLIBEXT
+	\$(RM) \$@ && \$(LN_S) krnl386.exe16/libkernel.$IMPLIBEXT \$@
 dlls/libkernel.cross.a: dlls/krnl386.exe16/libkernel.cross.a
 	\$(RM) \$@ && \$(LN_S) krnl386.exe16/libkernel.cross.a \$@
-dlls/libkernel.def: dlls/krnl386.exe16/libkernel.def
-	\$(RM) \$@ && \$(LN_S) krnl386.exe16/libkernel.def \$@
 clean::
-	\$(RM) dlls/libkernel.def
+	\$(RM) dlls/libkernel.$IMPLIBEXT
 dlls/krnl386.exe16/libkernel.$IMPLIBEXT dlls/krnl386.exe16/libkernel.cross.a: dlls/krnl386.exe16/krnl386.exe16.spec dlls/krnl386.exe16/Makefile
 	@cd dlls/krnl386.exe16 && \$(MAKE) \`basename \$@\`
 dlls/krnl386.exe16 dlls/krnl386.exe16/__install__ dlls/krnl386.exe16/__install-lib__ dlls/krnl386.exe16/__install-dev__: __builddeps__"
@@ -20229,14 +20225,12 @@ ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\
 	dlls/libwinspool.$IMPLIBEXT"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winspool.drv/libwinspool.$IMPLIBEXT dlls/winspool.drv/libwinspool.cross.a: tools/widl tools/winebuild tools/winegcc include
-dlls/libwinspool.a: dlls/winspool.drv/libwinspool.a
-	\$(RM) \$@ && \$(LN_S) winspool.drv/libwinspool.a \$@
+dlls/libwinspool.$IMPLIBEXT: dlls/winspool.drv/libwinspool.$IMPLIBEXT
+	\$(RM) \$@ && \$(LN_S) winspool.drv/libwinspool.$IMPLIBEXT \$@
 dlls/libwinspool.cross.a: dlls/winspool.drv/libwinspool.cross.a
 	\$(RM) \$@ && \$(LN_S) winspool.drv/libwinspool.cross.a \$@
-dlls/libwinspool.def: dlls/winspool.drv/libwinspool.def
-	\$(RM) \$@ && \$(LN_S) winspool.drv/libwinspool.def \$@
 clean::
-	\$(RM) dlls/libwinspool.def
+	\$(RM) dlls/libwinspool.$IMPLIBEXT
 dlls/winspool.drv/libwinspool.$IMPLIBEXT dlls/winspool.drv/libwinspool.cross.a: dlls/winspool.drv/winspool.drv.spec dlls/winspool.drv/Makefile
 	@cd dlls/winspool.drv && \$(MAKE) \`basename \$@\`
 dlls/winspool.drv dlls/winspool.drv/__install__ dlls/winspool.drv/__install-lib__ dlls/winspool.drv/__install-dev__: __builddeps__"
@@ -20559,14 +20553,12 @@ ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\
 	dlls/libxinput.$IMPLIBEXT"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/xinput1_3/libxinput.$IMPLIBEXT dlls/xinput1_3/libxinput.cross.a: tools/widl tools/winebuild tools/winegcc include
-dlls/libxinput.a: dlls/xinput1_3/libxinput.a
-	\$(RM) \$@ && \$(LN_S) xinput1_3/libxinput.a \$@
+dlls/libxinput.$IMPLIBEXT: dlls/xinput1_3/libxinput.$IMPLIBEXT
+	\$(RM) \$@ && \$(LN_S) xinput1_3/libxinput.$IMPLIBEXT \$@
 dlls/libxinput.cross.a: dlls/xinput1_3/libxinput.cross.a
 	\$(RM) \$@ && \$(LN_S) xinput1_3/libxinput.cross.a \$@
-dlls/libxinput.def: dlls/xinput1_3/libxinput.def
-	\$(RM) \$@ && \$(LN_S) xinput1_3/libxinput.def \$@
 clean::
-	\$(RM) dlls/libxinput.def
+	\$(RM) dlls/libxinput.$IMPLIBEXT
 dlls/xinput1_3/libxinput.$IMPLIBEXT dlls/xinput1_3/libxinput.cross.a: dlls/xinput1_3/xinput1_3.spec dlls/xinput1_3/Makefile
 	@cd dlls/xinput1_3 && \$(MAKE) \`basename \$@\`
 dlls/xinput1_3 dlls/xinput1_3/__install__ dlls/xinput1_3/__install-lib__ dlls/xinput1_3/__install-dev__: __builddeps__"