configure: Rename substituted variables to a standard _CFLAGS and _LIBS format.

configure

@@ -626,17 +626,16 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 LINGUAS
 ALL_VARS_RULES
-LDAPLIBS
-LIBRT
-LIBPOLL
-LIBDL
+LDAP_LIBS
+RT_LIBS
+POLL_LIBS
+DL_LIBS
 TOOLSEXT
 UNWINDFLAGS
 BUILTINFLAG
 EXTRACFLAGS
-LIBPROCSTAT
-LIBKSTAT
-LIBOPENAL
+PROCSTAT_LIBS
+KSTAT_LIBS
 MPG123_LIBS
 MPG123_CFLAGS
 TIFF_LIBS
@@ -647,20 +646,20 @@ JPEG_LIBS
 JPEG_CFLAGS
 FONTCONFIG_LIBS
 FONTCONFIG_CFLAGS
-CUPSINCL
+CUPS_CFLAGS
 CAPI20_LIBS
 CAPI20_CFLAGS
-OSS4INCL
-ALSALIBS
+OSS4_CFLAGS
+ALSA_LIBS
 GSTREAMER_LIBS
 GSTREAMER_CFLAGS
-LIBGETTEXTPO
-ZLIB
+GETTEXTPO_LIBS
+Z_LIBS
 FREETYPE_LIBS
 FREETYPE_CFLAGS
 LCMS2_LIBS
 LCMS2_CFLAGS
-RESOLVLIBS
+RESOLV_LIBS
 GPHOTO2_PORT_LIBS
 GPHOTO2_PORT_CFLAGS
 GPHOTO2_LIBS
@@ -682,25 +681,25 @@ X_LIBS
 X_PRE_LIBS
 X_CFLAGS
 XMKMF
-LIBPTHREAD
+PTHREAD_LIBS
 CROSSCC
 CROSSTARGET
 PRELINK
-CARBONLIB
-QUICKTIMELIB
-LIBOPENCL
-FRAMEWORK_OPENAL
-COREAUDIO
-SECURITYLIB
-DISKARBITRATIONLIB
-APPKITLIB
-CORESERVICESLIB
-APPLICATIONSERVICESLIB
-FORCEFEEDBACKLIB
-IOKITLIB
-COREFOUNDATIONLIB
+CARBON_LIBS
+QUICKTIME_LIBS
+OPENCL_LIBS
+OPENAL_LIBS
+COREAUDIO_LIBS
+SECURITY_LIBS
+DISKARBITRATION_LIBS
+APPKIT_LIBS
+CORESERVICES_LIBS
+APPLICATIONSERVICES_LIBS
+FORCEFEEDBACK_LIBS
+IOKIT_LIBS
+COREFOUNDATION_LIBS
 LIBWINE_RULES
-SOCKETLIBS
+SOCKET_LIBS
 DLLTOOL
 LOADER_RULES
 ALL_TEST_RESOURCES
@@ -7603,7 +7602,7 @@ fi
     case $host_os in
         mingw32*)
           crtlibs="-lmsvcrt"
-          SOCKETLIBS="-L\$(top_builddir)/dlls/ws2_32 -lws2_32"
+          SOCKET_LIBS="-L\$(top_builddir)/dlls/ws2_32 -lws2_32"
  ;;
     esac
 
@@ -7637,17 +7636,17 @@ uninstall::
     LIBWINE_LDFLAGS="-multiply_defined suppress"
     LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \$(bindir) \$(libdir)\`"
     LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine"
-        COREFOUNDATIONLIB="-framework CoreFoundation"
+        COREFOUNDATION_LIBS="-framework CoreFoundation"
 
-    IOKITLIB="-framework IOKit -framework CoreFoundation"
+    IOKIT_LIBS="-framework IOKit -framework CoreFoundation"
 
-    FORCEFEEDBACKLIB="-framework ForceFeedback -framework CoreFoundation"
+    FORCEFEEDBACK_LIBS="-framework ForceFeedback -framework CoreFoundation"
 
-    APPLICATIONSERVICESLIB="-framework ApplicationServices"
+    APPLICATIONSERVICES_LIBS="-framework ApplicationServices"
 
-    CORESERVICESLIB="-framework CoreServices"
+    CORESERVICES_LIBS="-framework CoreServices"
 
-    APPKITLIB="-framework AppKit"
+    APPKIT_LIBS="-framework AppKit"
 
     LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist"
     case $host_os in
@@ -7655,15 +7654,15 @@ uninstall::
     esac
     if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
     then
-                DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation"
+                DISKARBITRATION_LIBS="-framework DiskArbitration -framework CoreFoundation"
 
     fi
     if test "$ac_cv_header_Security_Security_h" = "yes"
     then
-        SECURITYLIB="-framework Security -framework CoreFoundation"
+        SECURITY_LIBS="-framework Security -framework CoreFoundation"
 
                 ac_save_LIBS="$LIBS"
-        LIBS="$LIBS $SECURITYLIB"
+        LIBS="$LIBS $SECURITY_LIBS"
         for ac_func in SSLCopyPeerCertificates
 do :
   ac_fn_c_check_func "$LINENO" "SSLCopyPeerCertificates" "ac_cv_func_SSLCopyPeerCertificates"
@@ -7682,14 +7681,14 @@ done
     then
         if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes"
         then
-            COREAUDIO="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI"
+            COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI"
 
         else
-                        COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI"
+                        COREAUDIO_LIBS="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI"
 
         fi
                 ac_save_LIBS="$LIBS"
-        LIBS="$LIBS $COREAUDIO"
+        LIBS="$LIBS $COREAUDIO_LIBS"
         for ac_func in AUGraphAddNode
 do :
   ac_fn_c_check_func "$LINENO" "AUGraphAddNode" "ac_cv_func_AUGraphAddNode"
@@ -7705,7 +7704,7 @@ done
     fi
     if test "$ac_cv_header_OpenAL_al_h" = "yes"
     then
-        FRAMEWORK_OPENAL="-framework OpenAL"
+        OPENAL_LIBS="-framework OpenAL"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7716,14 +7715,14 @@ _ACEOF
     fi
     if test "$ac_cv_header_OpenCL_opencl_h" = "yes"
     then
-        LIBOPENCL="-framework OpenCL"
+        OPENCL_LIBS="-framework OpenCL"
 
         ac_cv_lib_OpenCL_clGetPlatformInfo=yes
     fi
     if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes"
     then
         ac_save_LIBS="$LIBS"
-        LIBS="$LIBS $IOKITLIB"
+        LIBS="$LIBS $IOKIT_LIBS"
         for ac_func in IOHIDManagerCreate
 do :
   ac_fn_c_check_func "$LINENO" "IOHIDManagerCreate" "ac_cv_func_IOHIDManagerCreate"
@@ -7739,7 +7738,7 @@ done
     fi
     if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes"
     then
-        QUICKTIMELIB="-framework QuickTime -framework ApplicationServices -framework CoreVideo"
+        QUICKTIME_LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo"
 
         enable_wineqtdecoder=${enable_wineqtdecoder:-yes}
     else
@@ -7747,14 +7746,14 @@ done
     fi
     if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
     then
-        CARBONLIB="-framework Carbon"
+        CARBON_LIBS="-framework Carbon"
 
     fi
 
         if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
     then
         ac_save_LIBS="$LIBS"
-        LIBS="$LIBS $APPLICATIONSERVICESLIB"
+        LIBS="$LIBS $APPLICATIONSERVICES_LIBS"
         ac_fn_c_check_func "$LINENO" "CGDisplayModeGetWidth" "ac_cv_func_CGDisplayModeGetWidth"
 if test "x$ac_cv_func_CGDisplayModeGetWidth" = xyes; then :
   enable_winemac_drv=${enable_winemac_drv:-yes}
@@ -8515,14 +8514,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
 if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
-  LIBPTHREAD="-lpthread"
+  PTHREAD_LIBS="-lpthread"
 
 fi
 
 fi
 
 fi
-if test "x$ac_cv_func_pthread_create" != xyes -a "x$LIBPTHREAD" = x; then :
+if test "x$ac_cv_func_pthread_create" != xyes -a "x$PTHREAD_LIBS" = x; then :
   case "x$with_pthread" in
   xno) ;;
   *)   as_fn_error $? "pthread ${notice_platform}development files not found.
@@ -10440,7 +10439,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OpenCL_clGetPlatformInfo" >&5
 $as_echo "$ac_cv_lib_OpenCL_clGetPlatformInfo" >&6; }
 if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" = xyes; then :
-  LIBOPENCL="-lOpenCL"
+  OPENCL_LIBS="-lOpenCL"
 
 fi
 
@@ -11173,7 +11172,7 @@ This is an error since --with-gnutls was requested." "$LINENO" 5 ;;
 esac
 fi
 
-CURSESLIBS=""
+CURSES_LIBS=""
 if test "$ac_cv_header_ncurses_h" = "yes"
 then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lncurses" >&5
@@ -11227,7 +11226,7 @@ cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBNCURSES "$ac_cv_lib_soname_ncurses"
 _ACEOF
 
-       CURSESLIBS="-lncurses"
+       CURSES_LIBS="-lncurses"
 fi
 elif test "$ac_cv_header_curses_h" = "yes"
 then
@@ -11282,11 +11281,11 @@ cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBCURSES "$ac_cv_lib_soname_curses"
 _ACEOF
 
-       CURSESLIBS="-lcurses"
+       CURSES_LIBS="-lcurses"
 fi
 fi
 ac_save_LIBS="$LIBS"
-LIBS="$LIBS $CURSESLIBS"
+LIBS="$LIBS $CURSES_LIBS"
 for ac_func in mousemask
 do :
   ac_fn_c_check_func "$LINENO" "mousemask" "ac_cv_func_mousemask"
@@ -11655,12 +11654,12 @@ if ac_fn_c_try_link "$LINENO"; then :
 
 $as_echo "#define HAVE_RESOLV 1" >>confdefs.h
 
-         RESOLVLIBS="$lib"
+         RESOLV_LIBS="$lib"
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-      if test "${RESOLVLIBS+set}" = set; then
+      if test "${RESOLV_LIBS+set}" = set; then
         break
       fi
     done
@@ -11916,7 +11915,7 @@ $as_echo "#define HAVE_PPDEV 1" >>confdefs.h
 fi
 
 ac_wine_check_funcs_save_LIBS="$LIBS"
-LIBS="$LIBS $LIBPTHREAD"
+LIBS="$LIBS $PTHREAD_LIBS"
 for ac_func in \
         pthread_attr_get_np \
         pthread_getattr_np \
@@ -11978,12 +11977,12 @@ if test "x$ac_cv_lib_z_inflate" = xyes; then :
 
 $as_echo "#define HAVE_ZLIB 1" >>confdefs.h
 
-                            ZLIB="-lz"
+                            Z_LIBS="-lz"
 
 fi
 
 fi
-if test "x$ZLIB" = "x"; then :
+if test "x$Z_LIBS" = "x"; then :
   case "x$with_zlib" in
   x)   as_fn_append wine_notices "|libz ${notice_platform}development files not found, data compression won't be supported." ;;
   xno) ;;
@@ -12036,12 +12035,12 @@ if test "x$ac_cv_lib_gettextpo_po_message_msgctxt" = xyes; then :
 
 $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h
 
-                      LIBGETTEXTPO="-lgettextpo"
+                      GETTEXTPO_LIBS="-lgettextpo"
 
 fi
 
     fi
-    test "x$with_gettextpo" != xyes || if test "x$LIBGETTEXTPO" = "x"; then :
+    test "x$with_gettextpo" != xyes || if test "x$GETTEXTPO_LIBS" = "x"; then :
   case "x$with_gettextpo" in
   x)   as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;;
   xno) ;;
@@ -12206,7 +12205,7 @@ esac
 fi
 test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no}
 
-ALSALIBS=""
+ALSA_LIBS=""
 
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
 then
@@ -12263,7 +12262,7 @@ snd_pcm_hw_params_get_access_mask(NULL, NULL)
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ALSALIBS="-lasound"
+  ALSA_LIBS="-lasound"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
@@ -12289,7 +12288,7 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_OSS_SYSINFO_NUMAUDIOENGINES 1
 _ACEOF
 
-OSS4INCL="$ac_oss_incl"
+OSS4_CFLAGS="$ac_oss_incl"
 
 fi
 
@@ -12406,7 +12405,7 @@ This is an error since --with-capi was requested." "$LINENO" 5 ;;
 esac
 fi
 
-CUPSINCL=""
+CUPS_CFLAGS=""
 
 if test "x$with_cups" != "xno"
 then
@@ -12472,7 +12471,7 @@ cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBCUPS "$ac_cv_lib_soname_cups"
 _ACEOF
 
-       CUPSINCL="$ac_cups_cflags"
+       CUPS_CFLAGS="$ac_cups_cflags"
 fi
 fi
 
@@ -13127,7 +13126,7 @@ cat >>confdefs.h <<_ACEOF
 #define SONAME_LIBOPENAL "$ac_cv_lib_soname_openal"
 _ACEOF
 
-       LIBOPENAL="-lopenal"
+       OPENAL_LIBS="-lopenal"
 
                       ac_cv_lib_openal=yes
 
@@ -13189,7 +13188,7 @@ if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then :
 
 $as_echo "#define HAVE_LIBKSTAT 1" >>confdefs.h
 
-                  LIBKSTAT="-lkstat"
+                  KSTAT_LIBS="-lkstat"
 
 fi
 
@@ -13237,7 +13236,7 @@ if test "x$ac_cv_lib_procstat_procstat_open_sysctl" = xyes; then :
 
 $as_echo "#define HAVE_LIBPROCSTAT 1" >>confdefs.h
 
-                  LIBPROCSTAT="-lprocstat"
+                  PROCSTAT_LIBS="-lprocstat"
 
 fi
 
@@ -13360,12 +13359,12 @@ _ACEOF
 fi
 fi
 
-test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
-test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
+test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
+test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
 test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
 test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
 
-if test "x$ALSALIBS$COREAUDIO" = "x" -a \
+if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \
         "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
         "x$with_alsa$with_coreaudio$with_oss" != xnonono
 then
@@ -14473,13 +14472,13 @@ fi
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
- LIBDL="-ldl"
+ DL_LIBS="-ldl"
 
 fi
 
 fi
 ac_wine_check_funcs_save_LIBS="$LIBS"
-LIBS="$LIBS $LIBDL"
+LIBS="$LIBS $DL_LIBS"
 for ac_func in dladdr
 do :
   ac_fn_c_check_func "$LINENO" "dladdr" "ac_cv_func_dladdr"
@@ -14533,7 +14532,7 @@ fi
 $as_echo "$ac_cv_lib_poll_poll" >&6; }
 if test "x$ac_cv_lib_poll_poll" = xyes; then :
   $as_echo "#define HAVE_POLL 1" >>confdefs.h
- LIBPOLL="-lpoll"
+ POLL_LIBS="-lpoll"
 
 fi
 
@@ -14793,13 +14792,13 @@ if test "$ac_res" != no; then :
 
 $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
 
-                test "$ac_res" = "none required" || LIBRT="$ac_res"
+                test "$ac_res" = "none required" || RT_LIBS="$ac_res"
 
 fi
 
 LIBS=$ac_save_LIBS
 
-LDAPLIBS=""
+LDAP_LIBS=""
 
 if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
 then
@@ -14812,7 +14811,7 @@ if ${ac_cv_lib_ldap_r_ldap_initialize+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap_r $LIBPTHREAD $LIBS"
+LIBS="-lldap_r $PTHREAD_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14849,7 +14848,7 @@ if ${ac_cv_lib_lber_ber_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-llber $LIBPTHREAD $LIBS"
+LIBS="-llber $PTHREAD_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14883,7 +14882,7 @@ if test "x$ac_cv_lib_lber_ber_init" = xyes; then :
 
 $as_echo "#define HAVE_LDAP 1" >>confdefs.h
 
-                 LDAPLIBS="-lldap_r -llber"
+                 LDAP_LIBS="-lldap_r -llber"
 fi
 
 fi
@@ -14891,7 +14890,7 @@ fi
 fi
 
     ac_wine_check_funcs_save_LIBS="$LIBS"
-LIBS="$LIBS $LDAPLIBS $LIBPTHREAD"
+LIBS="$LIBS $LDAP_LIBS $PTHREAD_LIBS"
 for ac_func in \
 	ldap_count_references \
 	ldap_first_reference \
@@ -14914,7 +14913,7 @@ done
 
 LIBS="$ac_wine_check_funcs_save_LIBS"
 fi
-if test "x$LDAPLIBS" = "x"; then :
+if test "x$LDAP_LIBS" = "x"; then :
   case "x$with_ldap" in
   x)   as_fn_append wine_notices "|libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported." ;;
   xno) ;;
@@ -16458,6 +16457,21 @@ ac_config_commands="$ac_config_commands include/stamp-h"
 $as_echo_n "creating Makefile rules..." >&6
 
 ALL_VARS_RULES="OPENGL_LIBS = $OPENGL_LIBS
+SOCKET_LIBS = $SOCKET_LIBS
+COREFOUNDATION_LIBS = $COREFOUNDATION_LIBS
+IOKIT_LIBS = $IOKIT_LIBS
+FORCEFEEDBACK_LIBS = $FORCEFEEDBACK_LIBS
+APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS
+CORESERVICES_LIBS = $CORESERVICES_LIBS
+APPKIT_LIBS = $APPKIT_LIBS
+DISKARBITRATION_LIBS = $DISKARBITRATION_LIBS
+SECURITY_LIBS = $SECURITY_LIBS
+COREAUDIO_LIBS = $COREAUDIO_LIBS
+OPENAL_LIBS = $OPENAL_LIBS
+OPENCL_LIBS = $OPENCL_LIBS
+QUICKTIME_LIBS = $QUICKTIME_LIBS
+CARBON_LIBS = $CARBON_LIBS
+PTHREAD_LIBS = $PTHREAD_LIBS
 X_CFLAGS = $X_CFLAGS
 X_PRE_LIBS = $X_PRE_LIBS
 X_LIBS = $X_LIBS
@@ -16478,14 +16492,20 @@ GPHOTO2_CFLAGS = $GPHOTO2_CFLAGS
 GPHOTO2_LIBS = $GPHOTO2_LIBS
 GPHOTO2_PORT_CFLAGS = $GPHOTO2_PORT_CFLAGS
 GPHOTO2_PORT_LIBS = $GPHOTO2_PORT_LIBS
+RESOLV_LIBS = $RESOLV_LIBS
 LCMS2_CFLAGS = $LCMS2_CFLAGS
 LCMS2_LIBS = $LCMS2_LIBS
 FREETYPE_CFLAGS = $FREETYPE_CFLAGS
 FREETYPE_LIBS = $FREETYPE_LIBS
+Z_LIBS = $Z_LIBS
+GETTEXTPO_LIBS = $GETTEXTPO_LIBS
 GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS
 GSTREAMER_LIBS = $GSTREAMER_LIBS
+ALSA_LIBS = $ALSA_LIBS
+OSS4_CFLAGS = $OSS4_CFLAGS
 CAPI20_CFLAGS = $CAPI20_CFLAGS
 CAPI20_LIBS = $CAPI20_LIBS
+CUPS_CFLAGS = $CUPS_CFLAGS
 FONTCONFIG_CFLAGS = $FONTCONFIG_CFLAGS
 FONTCONFIG_LIBS = $FONTCONFIG_LIBS
 JPEG_CFLAGS = $JPEG_CFLAGS
@@ -16496,6 +16516,12 @@ TIFF_CFLAGS = $TIFF_CFLAGS
 TIFF_LIBS = $TIFF_LIBS
 MPG123_CFLAGS = $MPG123_CFLAGS
 MPG123_LIBS = $MPG123_LIBS
+KSTAT_LIBS = $KSTAT_LIBS
+PROCSTAT_LIBS = $PROCSTAT_LIBS
+DL_LIBS = $DL_LIBS
+POLL_LIBS = $POLL_LIBS
+RT_LIBS = $RT_LIBS
+LDAP_LIBS = $LDAP_LIBS
 "
 
 

configure.ac

@@ -711,7 +711,7 @@ case $host_os in
     case $host_os in
         mingw32*)
           crtlibs="-lmsvcrt"
-          AC_SUBST(SOCKETLIBS,"-L\$(top_builddir)/dlls/ws2_32 -lws2_32") ;;
+          AC_SUBST(SOCKET_LIBS,"-L\$(top_builddir)/dlls/ws2_32 -lws2_32") ;;
     esac
 
     libwine_targets="libwine.dll libwine.a"
@@ -744,12 +744,12 @@ uninstall::
     LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \$(bindir) \$(libdir)\`"
     LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine"
     dnl declare needed frameworks
-    AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
-    AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
-    AC_SUBST(FORCEFEEDBACKLIB,"-framework ForceFeedback -framework CoreFoundation")
-    AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices")
-    AC_SUBST(CORESERVICESLIB,"-framework CoreServices")
-    AC_SUBST(APPKITLIB,"-framework AppKit")
+    AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation")
+    AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation")
+    AC_SUBST(FORCEFEEDBACK_LIBS,"-framework ForceFeedback -framework CoreFoundation")
+    AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices")
+    AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices")
+    AC_SUBST(APPKIT_LIBS,"-framework AppKit")
     LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist"
     case $host_os in
       darwin11*) LDEXECFLAGS="-Wl,-macosx_version_min,10.6 $LDEXECFLAGS" ;;
@@ -757,14 +757,14 @@ uninstall::
     if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
     then
         dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found
-        AC_SUBST(DISKARBITRATIONLIB,"-framework DiskArbitration -framework CoreFoundation")
+        AC_SUBST(DISKARBITRATION_LIBS,"-framework DiskArbitration -framework CoreFoundation")
     fi
     if test "$ac_cv_header_Security_Security_h" = "yes"
     then
-        AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
+        AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation")
         dnl Check for the SSLCopyPeerCertificates function
         ac_save_LIBS="$LIBS"
-        LIBS="$LIBS $SECURITYLIB"
+        LIBS="$LIBS $SECURITY_LIBS"
         AC_CHECK_FUNCS(SSLCopyPeerCertificates)
         LIBS="$ac_save_LIBS"
         with_gnutls=${with_gnutls:-no}
@@ -773,52 +773,52 @@ uninstall::
     then
         if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes"
         then
-            AC_SUBST(COREAUDIO,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI")
+            AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI")
         else
             dnl CoreServices needed by AudioUnit
-            AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI")
+            AC_SUBST(COREAUDIO_LIBS,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI")
         fi
         dnl Check for the AUGraphAddNode function
         ac_save_LIBS="$LIBS"
-        LIBS="$LIBS $COREAUDIO"
+        LIBS="$LIBS $COREAUDIO_LIBS"
         AC_CHECK_FUNCS(AUGraphAddNode)
         LIBS="$ac_save_LIBS"
     fi
     if test "$ac_cv_header_OpenAL_al_h" = "yes"
     then
-        AC_SUBST(FRAMEWORK_OPENAL,"-framework OpenAL")
+        AC_SUBST(OPENAL_LIBS,"-framework OpenAL")
         AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])
         ac_cv_lib_openal=yes
     fi
     if test "$ac_cv_header_OpenCL_opencl_h" = "yes"
     then
-        AC_SUBST(LIBOPENCL,"-framework OpenCL")
+        AC_SUBST(OPENCL_LIBS,"-framework OpenCL")
         ac_cv_lib_OpenCL_clGetPlatformInfo=yes
     fi
     if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes"
     then
         ac_save_LIBS="$LIBS"
-        LIBS="$LIBS $IOKITLIB"
+        LIBS="$LIBS $IOKIT_LIBS"
         AC_CHECK_FUNCS(IOHIDManagerCreate)
         LIBS="$ac_save_LIBS"
     fi
     if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes"
     then
-        AC_SUBST(QUICKTIMELIB,"-framework QuickTime -framework ApplicationServices -framework CoreVideo")
+        AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo")
         enable_wineqtdecoder=${enable_wineqtdecoder:-yes}
     else
         WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.])
     fi
     if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
     then
-        AC_SUBST(CARBONLIB,"-framework Carbon")
+        AC_SUBST(CARBON_LIBS,"-framework Carbon")
     fi
 
     dnl Enable Mac driver on Mac OS X 10.6 or later
     if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
     then
         ac_save_LIBS="$LIBS"
-        LIBS="$LIBS $APPLICATIONSERVICESLIB"
+        LIBS="$LIBS $APPLICATIONSERVICES_LIBS"
         AC_CHECK_FUNC(CGDisplayModeGetWidth,enable_winemac_drv=${enable_winemac_drv:-yes})
         LIBS="$ac_save_LIBS"
     fi
@@ -1055,9 +1055,9 @@ dnl **** Check for pthread ****
 
 if test "$ac_cv_header_pthread_h" = "yes"
 then
-    AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(LIBPTHREAD,"-lpthread")])])
+    AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(PTHREAD_LIBS,"-lpthread")])])
 fi
-WINE_ERROR_WITH(pthread,[test "x$ac_cv_func_pthread_create" != xyes -a "x$LIBPTHREAD" = x],
+WINE_ERROR_WITH(pthread,[test "x$ac_cv_func_pthread_create" != xyes -a "x$PTHREAD_LIBS" = x],
 [pthread ${notice_platform}development files not found.
 Wine cannot support threads without libpthread.])
 
@@ -1256,7 +1256,7 @@ test "x$ac_cv_lib_GLU_gluLookAt" != xyes && enable_glu32=${enable_glu32:-no}
 dnl **** Check for OpenCL ****
 if test "$ac_cv_header_CL_cl_h" = "yes"
 then
-    AC_CHECK_LIB(OpenCL,clGetPlatformInfo,[AC_SUBST(LIBOPENCL,["-lOpenCL"])])
+    AC_CHECK_LIB(OpenCL,clGetPlatformInfo,[AC_SUBST(OPENCL_LIBS,["-lOpenCL"])])
 fi
 WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes],
                  [OpenCL ${notice_platform}development files not found, OpenCL won't be supported.])
@@ -1349,16 +1349,16 @@ WINE_NOTICE_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],
                  [libgnutls ${notice_platform}development files not found, no schannel support.])
 
 dnl **** Check which curses lib to use ***
-CURSESLIBS=""
+CURSES_LIBS=""
 if test "$ac_cv_header_ncurses_h" = "yes"
 then
-    WINE_CHECK_SONAME(ncurses,waddch,[CURSESLIBS="-lncurses"])
+    WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"])
 elif test "$ac_cv_header_curses_h" = "yes"
 then
-    WINE_CHECK_SONAME(curses,waddch,[CURSESLIBS="-lcurses"])
+    WINE_CHECK_SONAME(curses,waddch,[CURSES_LIBS="-lcurses"])
 fi
 ac_save_LIBS="$LIBS"
-LIBS="$LIBS $CURSESLIBS"
+LIBS="$LIBS $CURSES_LIBS"
 AC_CHECK_FUNCS(mousemask)
 LIBS="$ac_save_LIBS"
 WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
@@ -1422,8 +1422,8 @@ then
 #endif
 #include <resolv.h>]],[[res_query("foo",ns_c_in,0,0,0);]])],
         [AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header])
-         AC_SUBST(RESOLVLIBS,"$lib")])
-      if test "${RESOLVLIBS+set}" = set; then
+         AC_SUBST(RESOLV_LIBS,"$lib")])
+      if test "${RESOLV_LIBS+set}" = set; then
         break
       fi
     done
@@ -1489,15 +1489,15 @@ WINE_CHECK_LIB_FUNCS(\
         pthread_getthreadid_np \
         pthread_get_stackaddr_np \
         pthread_get_stacksize_np,
-        [$LIBPTHREAD])
+        [$PTHREAD_LIBS])
 
 dnl **** Check for zlib ****
 if test "$ac_cv_header_zlib_h" = "yes"
 then
     AC_CHECK_LIB(z,inflate,[AC_DEFINE(HAVE_ZLIB,1,[Define to 1 if you have the `z' library (-lz).])
-                            AC_SUBST(ZLIB,"-lz")])
+                            AC_SUBST(Z_LIBS,"-lz")])
 fi
-WINE_NOTICE_WITH(zlib,[test "x$ZLIB" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.])
+WINE_NOTICE_WITH(zlib,[test "x$Z_LIBS" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.])
 
 dnl **** Check for gettextpo ****
 if test "x$enable_tools" != xno
@@ -1506,9 +1506,9 @@ then
     then
         AC_CHECK_LIB(gettextpo,po_message_msgctxt,
                      [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).])
-                      AC_SUBST(LIBGETTEXTPO,"-lgettextpo")])
+                      AC_SUBST(GETTEXTPO_LIBS,"-lgettextpo")])
     fi
-    test "x$with_gettextpo" != xyes || WINE_NOTICE_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"],
+    test "x$with_gettextpo" != xyes || WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"],
           [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.])
 fi
 
@@ -1541,7 +1541,7 @@ WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" !=
 test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no}
 
 dnl **** Check for ALSA 1.x ****
-AC_SUBST(ALSALIBS,"")
+AC_SUBST(ALSA_LIBS,"")
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
 then
     AC_CHECK_LIB(asound,snd_pcm_hw_params_get_access_mask,
@@ -1550,7 +1550,7 @@ then
 #elif defined(HAVE_SYS_ASOUNDLIB_H)
 #include <sys/asoundlib.h>
 #endif]], [[snd_pcm_hw_params_get_access_mask(NULL, NULL)]])],
-                        [ALSALIBS="-lasound"])])
+                        [ALSA_LIBS="-lasound"])])
 fi
 
 dnl **** Check for OSSv4 ****
@@ -1565,7 +1565,7 @@ then
     CPPFLAGS="$CPPFLAGS $ac_oss_incl"
     AC_CHECK_HEADER([sys/soundcard.h],
         [AC_CHECK_MEMBERS([oss_sysinfo.numaudioengines],
-                          [AC_SUBST(OSS4INCL,"$ac_oss_incl")],,
+                          [AC_SUBST(OSS4_CFLAGS,"$ac_oss_incl")],,
                           [#include <sys/soundcard.h>])])
     CPPFLAGS="$ac_save_CPPFLAGS"
     if test "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes
@@ -1589,7 +1589,7 @@ WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_soname_capi20" = "x"],
                  [libcapi20 ${notice_platform}development files not found, ISDN won't be supported.])
 
 dnl **** Check for cups ****
-AC_SUBST(CUPSINCL,"")
+AC_SUBST(CUPS_CFLAGS,"")
 if test "x$with_cups" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
@@ -1598,7 +1598,7 @@ then
     CPPFLAGS="$CPPFLAGS $ac_cups_cflags"
     AC_CHECK_HEADERS(cups/cups.h,
             [WINE_CHECK_SONAME(cups,cupsGetDefault,
-                       [CUPSINCL="$ac_cups_cflags"],,
+                       [CUPS_CFLAGS="$ac_cups_cflags"],,
                        [$ac_cups_libs])])
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
@@ -1694,7 +1694,7 @@ test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes -o "x$ac_cv_header_AudioToolbox_Aud
 dnl **** Check for OpenAL 1.1 ****
 if test "$ac_cv_header_AL_al_h" = "yes"
 then
-    WINE_CHECK_SONAME(openal,alGetSource3i,[AC_SUBST(LIBOPENAL,"-lopenal")
+    WINE_CHECK_SONAME(openal,alGetSource3i,[AC_SUBST(OPENAL_LIBS,"-lopenal")
                       ac_cv_lib_openal=yes
                       AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])],,)
 fi
@@ -1707,7 +1707,7 @@ if test "$ac_cv_header_kstat_h" = "yes"
 then
     AC_CHECK_LIB(kstat,kstat_open,
                  [AC_DEFINE(HAVE_LIBKSTAT, 1, [Define to 1 if you have the `kstat' library (-lkstat).])
-                  AC_SUBST(LIBKSTAT,"-lkstat")])
+                  AC_SUBST(KSTAT_LIBS,"-lkstat")])
 fi
 
 dnl **** Check for libprocstat ****
@@ -1715,7 +1715,7 @@ if test "$ac_cv_header_libprocstat_h" = "yes"
 then
     AC_CHECK_LIB(procstat,procstat_open_sysctl,
                  [AC_DEFINE(HAVE_LIBPROCSTAT, 1, [Define to 1 if you have the `procstat' library (-lprocstat).])
-                  AC_SUBST(LIBPROCSTAT,"-lprocstat")])
+                  AC_SUBST(PROCSTAT_LIBS,"-lprocstat")])
 fi
 
 dnl **** Check for libodbc ****
@@ -1728,13 +1728,13 @@ then
 fi
 
 dnl **** Disable unsupported winmm drivers ****
-test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
-test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
+test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
+test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
 test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
 test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
 
 dnl **** Check for any sound system ****
-if test "x$ALSALIBS$COREAUDIO" = "x" -a \
+if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \
         "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
         "x$with_alsa$with_coreaudio$with_oss" != xnonono
 then
@@ -2079,14 +2079,14 @@ CFLAGS="$ac_save_CFLAGS"
 dnl Check for -ldl
 if test "$ac_cv_func_dlopen" = no
 then
-    AC_CHECK_LIB(dl,dlopen,[AC_DEFINE(HAVE_DLOPEN,1) AC_SUBST(LIBDL,"-ldl")])
+    AC_CHECK_LIB(dl,dlopen,[AC_DEFINE(HAVE_DLOPEN,1) AC_SUBST(DL_LIBS,"-ldl")])
 fi
-WINE_CHECK_LIB_FUNCS(dladdr,[$LIBDL])
+WINE_CHECK_LIB_FUNCS(dladdr,[$DL_LIBS])
 
 dnl Check for -lpoll for Mac OS X/Darwin
 if test "$ac_cv_func_poll" = no
 then
-    AC_CHECK_LIB(poll,poll,[AC_DEFINE(HAVE_POLL,1) AC_SUBST(LIBPOLL,"-lpoll")])
+    AC_CHECK_LIB(poll,poll,[AC_DEFINE(HAVE_POLL,1) AC_SUBST(POLL_LIBS,"-lpoll")])
 fi
 
 dnl Check for -lnsl for Solaris
@@ -2118,20 +2118,20 @@ dnl Check for clock_gettime which may be in -lrt
 ac_save_LIBS=$LIBS
 AC_SEARCH_LIBS(clock_gettime, rt,
                [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have the `clock_gettime' function.])
-                test "$ac_res" = "none required" || AC_SUBST(LIBRT,"$ac_res")])
+                test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
 LIBS=$ac_save_LIBS
 
 dnl **** Check for OpenLDAP ***
-AC_SUBST(LDAPLIBS,"")
+AC_SUBST(LDAP_LIBS,"")
 if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
 then
     AC_CHECK_TYPE(LDAPSortKey,
         [AC_CHECK_LIB(ldap_r, ldap_initialize,
             [AC_CHECK_LIB(lber, ber_init,
                 [AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment])
-                 LDAPLIBS="-lldap_r -llber"],,
-                 [$LIBPTHREAD])],,
-                 [$LIBPTHREAD])],,
+                 LDAP_LIBS="-lldap_r -llber"],,
+                 [$PTHREAD_LIBS])],,
+                 [$PTHREAD_LIBS])],,
         [#include <ldap.h>])
     WINE_CHECK_LIB_FUNCS(\
 	ldap_count_references \
@@ -2142,9 +2142,9 @@ then
 	ldap_parse_sortresponse_control \
 	ldap_parse_vlv_control \
 	ldap_parse_vlvresponse_control,
-        [$LDAPLIBS $LIBPTHREAD])
+        [$LDAP_LIBS $PTHREAD_LIBS])
 fi
-WINE_NOTICE_WITH(ldap,[test "x$LDAPLIBS" = "x"],
+WINE_NOTICE_WITH(ldap,[test "x$LDAP_LIBS" = "x"],
                  [libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported.])
 
 AC_CACHE_CHECK([whether mkdir takes only one argument],

dlls/advapi32/Makefile.in

@@ -2,7 +2,7 @@ EXTRADEFS = -D_ADVAPI32_
 MODULE    = advapi32.dll
 IMPORTLIB = advapi32
 DELAYIMPORTS = rpcrt4
-EXTRALIBS = @SECURITYLIB@
+EXTRALIBS = $(SECURITY_LIBS)
 
 C_SRCS = \
 	advapi.c \

dlls/cabinet/Makefile.in

 MODULE    = cabinet.dll
 IMPORTLIB = cabinet
-EXTRALIBS = @ZLIB@
+EXTRALIBS = $(Z_LIBS)
 
 C_SRCS = \
 	cabinet_main.c \

dlls/crypt32/Makefile.in

@@ -3,7 +3,7 @@ MODULE    = crypt32.dll
 IMPORTLIB = crypt32
 IMPORTS   = user32 advapi32
 DELAYIMPORTS = cryptnet
-EXTRALIBS = @SECURITYLIB@
+EXTRALIBS = $(SECURITY_LIBS)
 
 C_SRCS = \
 	base64.c \

dlls/dbghelp/Makefile.in

@@ -3,7 +3,7 @@ IMPORTLIB = dbghelp
 EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DDLLPREFIX='"$(DLLPREFIX)"'
 IMPORTS   = psapi
 DELAYIMPORTS = version
-EXTRALIBS = @ZLIB@
+EXTRALIBS = $(Z_LIBS)
 
 C_SRCS = \
 	coff.c \

dlls/dinput/Makefile.in

 MODULE    = dinput.dll
 IMPORTLIB = dinput
 IMPORTS   = dxguid uuid comctl32 ole32 user32 advapi32
-EXTRALIBS = @IOKITLIB@ @FORCEFEEDBACKLIB@
+EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS)
 
 C_SRCS = \
 	config.c \

dlls/dnsapi/Makefile.in

 MODULE    = dnsapi.dll
 IMPORTLIB = dnsapi
 IMPORTS   = netapi32
-EXTRALIBS = @RESOLVLIBS@
+EXTRALIBS = $(RESOLV_LIBS)
 
 C_SRCS = \
 	main.c \

dlls/gdi32/Makefile.in

@@ -3,7 +3,7 @@ MODULE    = gdi32.dll
 IMPORTLIB = gdi32
 IMPORTS   = advapi32
 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS)
-EXTRALIBS = @CARBONLIB@ @APPKITLIB@
+EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS)
 DELAYIMPORTS = usp10
 
 C_SRCS = \

dlls/iphlpapi/Makefile.in

 MODULE    = iphlpapi.dll
 IMPORTLIB = iphlpapi
 IMPORTS   = advapi32
-EXTRALIBS = @RESOLVLIBS@ @LIBKSTAT@ @LIBPROCSTAT@
+EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS)
 
 C_SRCS = \
 	icmp.c \

dlls/kernel32/Makefile.in

@@ -2,7 +2,7 @@ EXTRADEFS = -D_KERNEL32_ -D_NORMALIZE_
 MODULE    = kernel32.dll
 IMPORTLIB = kernel32
 IMPORTS   = winecrt0 ntdll
-EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@
+EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS)
 EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
 
 C_SRCS = \

dlls/mountmgr.sys/Makefile.in

@@ -3,7 +3,7 @@ IMPORTS   = uuid advapi32 ntoskrnl.exe
 DELAYIMPORTS = user32
 EXTRADLLFLAGS = -Wb,--subsystem,native
 EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS)
-EXTRALIBS = @DISKARBITRATIONLIB@
+EXTRALIBS = $(DISKARBITRATION_LIBS)
 
 C_SRCS = \
 	dbus.c \

dlls/ntdll/Makefile.in

@@ -2,7 +2,7 @@ EXTRADEFS = -D_NTSYSTEM_
 MODULE    = ntdll.dll
 IMPORTLIB = ntdll
 IMPORTS   = winecrt0
-EXTRALIBS = @IOKITLIB@ @LIBRT@ @LIBPTHREAD@
+EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS)
 EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
 
 C_SRCS = \

dlls/openal32/Makefile.in

 MODULE    = openal32.dll
-EXTRALIBS = @LIBOPENAL@ @FRAMEWORK_OPENAL@
+EXTRALIBS = $(OPENAL_LIBS)
 
 C_SRCS = \
 	openal.c

dlls/opencl/Makefile.in

 MODULE    = opencl.dll
-EXTRALIBS = @LIBOPENCL@
+EXTRALIBS = $(OPENCL_LIBS)
 
 C_SRCS = \
 	opencl.c

dlls/rpcrt4/Makefile.in

@@ -3,7 +3,7 @@ MODULE    = rpcrt4.dll
 IMPORTLIB = rpcrt4
 IMPORTS   = uuid advapi32
 DELAYIMPORTS = iphlpapi wininet secur32 user32
-EXTRALIBS = @SOCKETLIBS@
+EXTRALIBS = $(SOCKET_LIBS)
 
 C_SRCS = \
 	cproxy.c \

dlls/secur32/Makefile.in

@@ -3,7 +3,7 @@ IMPORTLIB = secur32
 IMPORTS   = netapi32 advapi32
 DELAYIMPORTS = crypt32
 EXTRAINCL = $(GNUTLS_CFLAGS)
-EXTRALIBS = @SECURITYLIB@
+EXTRALIBS = $(SECURITY_LIBS)
 
 C_SRCS = \
 	base64_codec.c \

dlls/shell32/Makefile.in

@@ -3,7 +3,7 @@ MODULE    = shell32.dll
 IMPORTLIB = shell32
 IMPORTS   = uuid shlwapi user32 gdi32 advapi32
 DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32
-EXTRALIBS = @CORESERVICESLIB@
+EXTRALIBS = $(CORESERVICES_LIBS)
 # AUTHORS file is in the top-level directory
 EXTRAINCL = -I$(top_srcdir)
 

dlls/windowscodecs/Makefile.in

@@ -2,7 +2,7 @@ MODULE    = windowscodecs.dll
 IMPORTLIB = windowscodecs
 IMPORTS   = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32
 EXTRAINCL = $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS)
-EXTRALIBS = @APPLICATIONSERVICESLIB@
+EXTRALIBS = $(APPLICATIONSERVICES_LIBS)
 
 C_SRCS = \
 	bitmap.c \

dlls/winealsa.drv/Makefile.in

 MODULE    = winealsa.drv
 IMPORTS   = uuid ole32 advapi32
 DELAYIMPORTS = winmm
-EXTRALIBS = @ALSALIBS@
+EXTRALIBS = $(ALSA_LIBS)
 
 C_SRCS = \
 	midi.c \

dlls/winecoreaudio.drv/Makefile.in

 MODULE    = winecoreaudio.drv
 IMPORTS   = uuid ole32 user32
 DELAYIMPORTS = winmm
-EXTRALIBS = @COREAUDIO@
+EXTRALIBS = $(COREAUDIO_LIBS)
 
 C_SRCS = \
 	audiounit.c \

dlls/winegstreamer/Makefile.in

 MODULE    = winegstreamer.dll
 IMPORTS   = strmbase strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32
 EXTRAINCL = $(GSTREAMER_CFLAGS)
-EXTRALIBS = $(GSTREAMER_LIBS) @LIBPTHREAD@
+EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS)
 
 C_SRCS = \
 	glibthread.c \

dlls/winemp3.acm/Makefile.in

 MODULE    = winemp3.acm
 IMPORTS   = winmm user32
 EXTRAINCL = $(MPG123_CFLAGS)
-EXTRALIBS = $(MPG123_LIBS) @COREAUDIO@
+EXTRALIBS = $(MPG123_LIBS) $(COREAUDIO_LIBS)
 
 C_SRCS = \
 	mpegl3.c

dlls/wineoss.drv/Makefile.in

 MODULE    = wineoss.drv
 IMPORTS   = uuid ole32 user32
 DELAYIMPORTS = winmm
-EXTRAINCL = @OSS4INCL@
+EXTRAINCL = $(OSS4_CFLAGS)
 
 C_SRCS = \
 	midi.c \

dlls/wineqtdecoder/Makefile.in

 MODULE    = wineqtdecoder.dll
 IMPORTS   = strmiids strmbase uuid ole32 advapi32
-EXTRALIBS = @QUICKTIMELIB@
+EXTRALIBS = $(QUICKTIME_LIBS)
 
 C_SRCS = \
 	main.c \

dlls/winhttp/Makefile.in

@@ -2,7 +2,7 @@ MODULE    = winhttp.dll
 IMPORTLIB = winhttp
 IMPORTS   = uuid user32 advapi32
 DELAYIMPORTS = oleaut32 ole32 crypt32 secur32
-EXTRALIBS = @SOCKETLIBS@
+EXTRALIBS = $(SOCKET_LIBS)
 
 C_SRCS = \
 	cookie.c \

dlls/wininet/Makefile.in

@@ -3,7 +3,7 @@ MODULE    = wininet.dll
 IMPORTLIB = wininet
 IMPORTS   = mpr shlwapi shell32 user32 advapi32
 DELAYIMPORTS = secur32 crypt32 cryptui
-EXTRALIBS = @SOCKETLIBS@ @ZLIB@
+EXTRALIBS = $(SOCKET_LIBS) $(Z_LIBS)
 
 C_SRCS = \
 	cookie.c \

dlls/winspool.drv/Makefile.in

@@ -2,8 +2,8 @@ EXTRADEFS = -D_SPOOL32_
 MODULE    = winspool.drv
 IMPORTLIB = winspool
 IMPORTS   = user32 gdi32 advapi32
-EXTRAINCL = @CUPSINCL@
-EXTRALIBS = @APPLICATIONSERVICESLIB@
+EXTRAINCL = $(CUPS_CFLAGS)
+EXTRALIBS = $(APPLICATIONSERVICES_LIBS)
 
 C_SRCS = \
 	info.c \

dlls/wldap32/Makefile.in

 MODULE    = wldap32.dll
 IMPORTLIB = wldap32
 IMPORTS   = user32
-EXTRALIBS = @LDAPLIBS@
+EXTRALIBS = $(LDAP_LIBS)
 
 C_SRCS = \
 	add.c \

dlls/ws2_32/Makefile.in

@@ -2,7 +2,7 @@ EXTRADEFS = -DUSE_WS_PREFIX
 MODULE    = ws2_32.dll
 IMPORTLIB = ws2_32
 DELAYIMPORTS = iphlpapi user32
-EXTRALIBS = @LIBPOLL@
+EXTRALIBS = $(POLL_LIBS)
 
 C_SRCS = \
 	async.c \

libs/wine/Makefile.in

-EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@
+EXTRALIBS = $(LIBPORT) $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS)
 EXTRADEFS = -DWINE_UNICODE_API=""
 STATICLIB = libwine_static.a
 

loader/Makefile.in

-EXTRALIBS = @LIBPTHREAD@
+EXTRALIBS = $(PTHREAD_LIBS)
 
 C_SRCS = \
 	main.c \

programs/hostname/Makefile.in

 MODULE    = hostname.exe
 APPMODE   = -mconsole -municode
-EXTRALIBS = @SOCKETLIBS@
+EXTRALIBS = $(SOCKET_LIBS)
 DELAYIMPORTS = user32
 
 C_SRCS = hostname.c

programs/winedbg/Makefile.in

@@ -2,7 +2,7 @@ MODULE    = winedbg.exe
 APPMODE   = -mconsole
 IMPORTS   = psapi dbghelp advapi32
 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32
-EXTRALIBS = @LIBPOLL@
+EXTRALIBS = $(POLL_LIBS)
 
 C_SRCS = \
 	be_arm.c \

server/Makefile.in

-EXTRALIBS = @LIBPOLL@ @LIBRT@
+EXTRALIBS = $(POLL_LIBS) $(RT_LIBS)
 
 C_SRCS = \
 	async.c \

tools/wmc/Makefile.in

 PROGRAMS = wmc$(EXEEXT)
 MANPAGES = wmc.man.in
-ALL_LIBS = @LIBGETTEXTPO@ $(LIBWINE_STATIC) $(LIBPORT)
+ALL_LIBS = $(GETTEXTPO_LIBS) $(LIBWINE_STATIC) $(LIBPORT)
 
 C_SRCS = \
 	lang.c \

tools/wrc/Makefile.in

 PROGRAMS = wrc$(EXEEXT)
 MANPAGES = wrc.man.in
-ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)
+ALL_LIBS = $(GETTEXTPO_LIBS) $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)
 
 C_SRCS = \
 	dumpres.c \