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

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 \