configure: Automatically expand _CFLAGS and _LIBS variables in all makefiles.

This commit is contained in:
Alexandre Julliard 2014-01-30 11:15:49 +01:00
parent 5a14d9e1e3
commit 8aa64e3580
17 changed files with 68 additions and 22 deletions

View File

@ -66,6 +66,7 @@ INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS)
prog_manext = 1
api_manext = 3w
conf_manext = 5
@ALL_VARS_RULES@
@SET_MAKE@
all:

41
configure vendored
View File

@ -625,6 +625,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
LINGUAS
ALL_VARS_RULES
LDAPLIBS
LIBRT
LIBPOLL
@ -16462,6 +16463,46 @@ ac_config_commands="$ac_config_commands include/stamp-h"
$as_echo_n "creating Makefile rules..." >&6
ALL_VARS_RULES="OPENGL_LIBS = $OPENGL_LIBS
X_CFLAGS = $X_CFLAGS
X_PRE_LIBS = $X_PRE_LIBS
X_LIBS = $X_LIBS
X_EXTRA_LIBS = $X_EXTRA_LIBS
XML2_CFLAGS = $XML2_CFLAGS
XML2_LIBS = $XML2_LIBS
XSLT_CFLAGS = $XSLT_CFLAGS
XSLT_LIBS = $XSLT_LIBS
DBUS_CFLAGS = $DBUS_CFLAGS
DBUS_LIBS = $DBUS_LIBS
HAL_CFLAGS = $HAL_CFLAGS
HAL_LIBS = $HAL_LIBS
GNUTLS_CFLAGS = $GNUTLS_CFLAGS
GNUTLS_LIBS = $GNUTLS_LIBS
SANE_CFLAGS = $SANE_CFLAGS
SANE_LIBS = $SANE_LIBS
GPHOTO2_CFLAGS = $GPHOTO2_CFLAGS
GPHOTO2_LIBS = $GPHOTO2_LIBS
GPHOTO2_PORT_CFLAGS = $GPHOTO2_PORT_CFLAGS
GPHOTO2_PORT_LIBS = $GPHOTO2_PORT_LIBS
LCMS2_CFLAGS = $LCMS2_CFLAGS
LCMS2_LIBS = $LCMS2_LIBS
FREETYPE_CFLAGS = $FREETYPE_CFLAGS
FREETYPE_LIBS = $FREETYPE_LIBS
GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS
GSTREAMER_LIBS = $GSTREAMER_LIBS
CAPI20_CFLAGS = $CAPI20_CFLAGS
CAPI20_LIBS = $CAPI20_LIBS
JPEG_CFLAGS = $JPEG_CFLAGS
JPEG_LIBS = $JPEG_LIBS
PNG_CFLAGS = $PNG_CFLAGS
PNG_LIBS = $PNG_LIBS
TIFF_CFLAGS = $TIFF_CFLAGS
TIFF_LIBS = $TIFF_LIBS
MPG123_CFLAGS = $MPG123_CFLAGS
MPG123_LIBS = $MPG123_LIBS
"
wine_fn_append_rule "
# Rules automatically generated by configure

View File

@ -2593,6 +2593,10 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */
AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD
AC_SUBST([ALL_VARS_RULES],
"m4_set_foreach([_AC_SUBST_VARS],[var],[m4_if(m4_bregexp(m4_defn([var]),[\(_CFLAGS\|_LIBS\)$]),-1,,[var = $var
])])")
dnl Main makefile
WINE_APPEND_RULE([

View File

@ -1,5 +1,5 @@
MODULE = capi2032.dll
IMPORTLIB = capi2032
EXTRAINCL = @CAPI20_CFLAGS@
EXTRAINCL = $(CAPI20_CFLAGS)
C_SRCS = cap20wxx.c

View File

@ -2,7 +2,7 @@ EXTRADEFS = -D_GDI32_
MODULE = gdi32.dll
IMPORTLIB = gdi32
IMPORTS = advapi32
EXTRAINCL = @FREETYPE_CFLAGS@ @FONTCONFIGINCL@
EXTRAINCL = $(FREETYPE_CFLAGS) @FONTCONFIGINCL@
EXTRALIBS = @CARBONLIB@ @APPKITLIB@
DELAYIMPORTS = usp10

View File

@ -1,7 +1,7 @@
MODULE = glu32.dll
IMPORTLIB = glu32
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = -lGLU @OPENGL_LIBS@ @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@
EXTRAINCL = $(X_CFLAGS)
EXTRALIBS = -lGLU $(OPENGL_LIBS) $(X_LIBS) @XLIB@ $(X_EXTRA_LIBS)
C_SRCS = \
glu.c

View File

@ -1,7 +1,7 @@
MODULE = gphoto2.ds
IMPORTS = comctl32 user32 gdi32 advapi32
EXTRALIBS = @GPHOTO2_LIBS@ @GPHOTO2_PORT_LIBS@
EXTRAINCL = @GPHOTO2_CFLAGS@ @GPHOTO2_PORT_CFLAGS@ @JPEG_CFLAGS@
EXTRALIBS = $(GPHOTO2_LIBS) $(GPHOTO2_PORT_LIBS)
EXTRAINCL = $(GPHOTO2_CFLAGS) $(GPHOTO2_PORT_CFLAGS) $(JPEG_CFLAGS)
C_SRCS = \
capability.c \

View File

@ -2,7 +2,7 @@ MODULE = mountmgr.sys
IMPORTS = uuid advapi32 ntoskrnl.exe
DELAYIMPORTS = user32
EXTRADLLFLAGS = -Wb,--subsystem,native
EXTRAINCL = @DBUS_CFLAGS@ @HAL_CFLAGS@
EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS)
EXTRALIBS = @DISKARBITRATIONLIB@
C_SRCS = \

View File

@ -1,8 +1,8 @@
MODULE = mscms.dll
IMPORTLIB = mscms
IMPORTS = shlwapi advapi32
EXTRAINCL = @LCMS2_CFLAGS@
EXTRALIBS = @LCMS2_LIBS@
EXTRAINCL = $(LCMS2_CFLAGS)
EXTRALIBS = $(LCMS2_LIBS)
C_SRCS = \
handle.c \

View File

@ -1,7 +1,7 @@
MODULE = msxml3.dll
IMPORTS = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
EXTRALIBS = @XML2_LIBS@
EXTRAINCL = @XML2_CFLAGS@ @XSLT_CFLAGS@
EXTRALIBS = $(XML2_LIBS)
EXTRAINCL = $(XML2_CFLAGS) $(XSLT_CFLAGS)
C_SRCS = \
attribute.c \

View File

@ -1,6 +1,6 @@
MODULE = sane.ds
IMPORTS = comctl32 user32 gdi32
EXTRAINCL = @SANE_CFLAGS@
EXTRAINCL = $(SANE_CFLAGS)
C_SRCS = \
capability.c \

View File

@ -2,7 +2,7 @@ MODULE = secur32.dll
IMPORTLIB = secur32
IMPORTS = netapi32 advapi32
DELAYIMPORTS = crypt32
EXTRAINCL = @GNUTLS_CFLAGS@
EXTRAINCL = $(GNUTLS_CFLAGS)
EXTRALIBS = @SECURITYLIB@
C_SRCS = \

View File

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

View File

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

View File

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

View File

@ -1,8 +1,8 @@
MODULE = winex11.drv
IMPORTS = uuid user32 gdi32 advapi32
DELAYIMPORTS = comctl32 ole32 shell32 imm32
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@
EXTRAINCL = $(X_CFLAGS)
EXTRALIBS = $(X_LIBS) @XLIB@ $(X_EXTRA_LIBS)
C_SRCS = \
bitblt.c \

View File

@ -1,5 +1,5 @@
EXTRAINCL = @FREETYPE_CFLAGS@
FREETYPELIBS = @FREETYPE_LIBS@
EXTRAINCL = $(FREETYPE_CFLAGS)
FREETYPELIBS = $(FREETYPE_LIBS)
PROGRAMS = \
fnt2fon$(EXEEXT) \