Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
frmdstryr
wine
Commits
37c0f5c6
Commit
37c0f5c6
authored
3 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Substitute all defined variables in the main makefile.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1aa16d05
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Makefile.in
+1
-68
1 addition, 68 deletions
Makefile.in
configure
+265
-115
265 additions, 115 deletions
configure
configure.ac
+27
-17
27 additions, 17 deletions
configure.ac
server/Makefile.in
+1
-1
1 addition, 1 deletion
server/Makefile.in
tools/makedep.c
+2
-2
2 additions, 2 deletions
tools/makedep.c
with
296 additions
and
203 deletions
Makefile.in
+
1
−
68
View file @
37c0f5c6
...
...
@@ -21,74 +21,7 @@
prefix
=
@prefix@
exec_prefix
=
@exec_prefix@
bindir
=
@bindir@
libdir
=
@libdir@
datarootdir
=
@datarootdir@
datadir
=
@datadir@
mandir
=
@mandir@
includedir
=
@includedir@
fontdir
=
${
datadir
}
/wine/fonts
nlsdir
=
${
datadir
}
/wine/nls
dlldir
=
${
libdir
}
/wine
srcdir
=
@srcdir@
host_cpu
=
@host_cpu@
SHELL
=
/bin/sh
CC
=
@CC@
CXX
=
@CXX@
CPPBIN
=
@CPPBIN@
CROSSCC
=
@CROSSCC@
CFLAGS
=
@CFLAGS@
CPPFLAGS
=
@CPPFLAGS@
CROSSCFLAGS
=
@CROSSCFLAGS@
CROSSLDFLAGS
=
@CROSSLDFLAGS@
EXTRACFLAGS
=
@EXTRACFLAGS@
EXTRACROSSCFLAGS
=
@EXTRACROSSCFLAGS@
MSVCRTFLAGS
=
@MSVCRTFLAGS@
TARGETFLAGS
=
@TARGETFLAGS@
LDDLLFLAGS
=
@LDDLLFLAGS@
LDEXECFLAGS
=
@LDEXECFLAGS@
UNIXDLLFLAGS
=
@UNIXDLLFLAGS@
UNIXLDFLAGS
=
@UNIXLDFLAGS@
LIBS
=
@LIBS@
BISON
=
@BISON@
FLEX
=
@FLEX@
EXEEXT
=
@EXEEXT@
TOOLSEXT
=
@TOOLSEXT@
DLLTOOL
=
@DLLTOOL@
AR
=
@AR@
RANLIB
=
@RANLIB@
STRIP
=
@STRIP@
LN_S
=
@LN_S@
TOOLSDIR
=
@TOOLSDIR@
LD
=
@LD@
LDFLAGS
=
@LDFLAGS@
DLLFLAGS
=
@DLLFLAGS@
PRELINK
=
@PRELINK@
FONTFORGE
=
@FONTFORGE@
RSVG
=
@RSVG@
CONVERT
=
@CONVERT@
ICOTOOL
=
@ICOTOOL@
MSGFMT
=
@MSGFMT@
CROSSTARGET
=
@CROSSTARGET@
CROSSDEBUG
=
@CROSSDEBUG@
SUBDIRS
=
@SUBDIRS@
RUNTESTFLAGS
=
-q
-P
wine
MAKEDEP
=
$(
TOOLSDIR
)
/tools/makedep
$(
TOOLSEXT
)
DELAYLOADFLAG
=
@DELAYLOADFLAG@
PACKAGE_VERSION
=
@PACKAGE_VERSION@
SED_CMD
=
LC_ALL
=
C
sed
-e
's,@bindir\@,
${
bindir
}
,g'
-e
's,@dlldir\@,
${
dlldir
}
,g'
-e
's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g'
-e
's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g'
api_manext
=
3w
WINELOADER_PROGRAMS
=
@WINELOADER_PROGRAMS@
WINELOADER_DEPENDS
=
@WINELOADER_DEPENDS@
WINELOADER_LDFLAGS
=
@WINELOADER_LDFLAGS@
WINEPRELOADER_LDFLAGS
=
@WINEPRELOADER_LDFLAGS@
LIBWINE_SHAREDLIB
=
@LIBWINE_SHAREDLIB@
LIBWINE_LDFLAGS
=
@LIBWINE_LDFLAGS@
LIBWINE_DEPENDS
=
@LIBWINE_DEPENDS@
DISABLED_SUBDIRS
=
@DISABLED_SUBDIRS@
CONFIGURE_TARGETS
=
@CONFIGURE_TARGETS@
TOP_INSTALL_LIB
=
@TOP_INSTALL_LIB@
TOP_INSTALL_DEV
=
@TOP_INSTALL_DEV@
@ALL_VARS_RULES@
@SET_MAKE@
...
...
This diff is collapsed.
Click to expand it.
configure
+
265
−
115
View file @
37c0f5c6
...
...
@@ -625,10 +625,12 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
ALL_VARS_RULES
api_manext
SED_CMD
RUNTESTFLAGS
LDAP_LIBS
LDAP_CFLAGS
RT_LIBS
TOOLSEXT
MSVCRTFLAGS
VKD3D_SHADER_LIBS
VKD3D_SHADER_CFLAGS
...
...
@@ -777,7 +779,9 @@ ac_ct_AR
AR
BISON
FLEX
TOOLSDIR
MAKEDEP
toolsdir
toolsext
TARGETFLAGS
LD
CPPBIN
...
...
@@ -792,6 +796,10 @@ LDFLAGS
CFLAGS
CC
SET_MAKE
srcdir
nlsdir
fontdir
dlldir
host_os
host_vendor
host_cpu
...
...
@@ -4367,6 +4375,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
dlldir=\${libdir}/wine
fontdir=\${datadir}/wine/fonts
nlsdir=\${datadir}/wine/nls
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
...
...
@@ -5861,6 +5877,13 @@ then
--enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5
fi
case $build_os in
cygwin*|mingw32*) toolsext=".exe"
;;
*) toolsext=""
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5
$as_echo_n "checking for the directory containing the Wine tools... " >&6; }
if ${wine_cv_toolsdir+:} false; then :
...
...
@@ -5878,18 +5901,19 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_toolsdir" >&5
$as_echo "$wine_cv_toolsdir" >&6; }
if test -z "$wine_cv_toolsdir"; then
wine_makedep=tools/makedep
TOOLSDIR="."
wine_makedep=tools/makedep$toolsext
elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
wine_makedep=$wine_cv_toolsdir/tools/makedep
TOOLSDIR=$wine_cv_toolsdir
wine_makedep=$wine_cv_toolsdir/tools/makedep$toolsext
enable_tools=${enable_tools:-no}
test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5
else
as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5
fi
toolsdir=$wine_cv_toolsdir
MAKEDEP=$wine_makedep
if test -n "$host_alias" -a "$host_alias" != "$build_alias"
then
TARGETFLAGS="-b $host_alias $TARGETFLAGS"
...
...
@@ -16668,11 +16692,6 @@ else
fi
case $build_os in
cygwin*|mingw32*) TOOLSEXT=".exe"
;;
esac
case $host_os in
linux*)
case $host_cpu in
...
...
@@ -18399,107 +18418,6 @@ ac_config_commands="$ac_config_commands include/stamp-h"
$as_echo_n "creating Makefile rules..." >&6
ALL_VARS_RULES="I386_LIBS = $I386_LIBS
OPENGL_LIBS = $OPENGL_LIBS
COREFOUNDATION_LIBS = $COREFOUNDATION_LIBS
IOKIT_LIBS = $IOKIT_LIBS
APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS
CORESERVICES_LIBS = $CORESERVICES_LIBS
APPKIT_LIBS = $APPKIT_LIBS
SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_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
METAL_LIBS = $METAL_LIBS
EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS
FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS
FAUDIO_PE_LIBS = $FAUDIO_PE_LIBS
GSM_PE_CFLAGS = $GSM_PE_CFLAGS
GSM_PE_LIBS = $GSM_PE_LIBS
JPEG_PE_CFLAGS = $JPEG_PE_CFLAGS
JPEG_PE_LIBS = $JPEG_PE_LIBS
JXR_PE_CFLAGS = $JXR_PE_CFLAGS
JXR_PE_LIBS = $JXR_PE_LIBS
LCMS2_PE_CFLAGS = $LCMS2_PE_CFLAGS
LCMS2_PE_LIBS = $LCMS2_PE_LIBS
MPG123_PE_CFLAGS = $MPG123_PE_CFLAGS
MPG123_PE_LIBS = $MPG123_PE_LIBS
PNG_PE_CFLAGS = $PNG_PE_CFLAGS
PNG_PE_LIBS = $PNG_PE_LIBS
TIFF_PE_CFLAGS = $TIFF_PE_CFLAGS
TIFF_PE_LIBS = $TIFF_PE_LIBS
XML2_PE_CFLAGS = $XML2_PE_CFLAGS
XML2_PE_LIBS = $XML2_PE_LIBS
XSLT_PE_CFLAGS = $XSLT_PE_CFLAGS
XSLT_PE_LIBS = $XSLT_PE_LIBS
ZLIB_PE_CFLAGS = $ZLIB_PE_CFLAGS
ZLIB_PE_LIBS = $ZLIB_PE_LIBS
PTHREAD_LIBS = $PTHREAD_LIBS
X_CFLAGS = $X_CFLAGS
X_PRE_LIBS = $X_PRE_LIBS
X_LIBS = $X_LIBS
X_EXTRA_LIBS = $X_EXTRA_LIBS
PCAP_LIBS = $PCAP_LIBS
INOTIFY_CFLAGS = $INOTIFY_CFLAGS
INOTIFY_LIBS = $INOTIFY_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
USB_CFLAGS = $USB_CFLAGS
USB_LIBS = $USB_LIBS
GPHOTO2_CFLAGS = $GPHOTO2_CFLAGS
GPHOTO2_LIBS = $GPHOTO2_LIBS
GPHOTO2_PORT_CFLAGS = $GPHOTO2_PORT_CFLAGS
GPHOTO2_PORT_LIBS = $GPHOTO2_PORT_LIBS
RESOLV_LIBS = $RESOLV_LIBS
FREETYPE_CFLAGS = $FREETYPE_CFLAGS
FREETYPE_LIBS = $FREETYPE_LIBS
GETTEXTPO_LIBS = $GETTEXTPO_LIBS
PULSE_CFLAGS = $PULSE_CFLAGS
PULSE_LIBS = $PULSE_LIBS
GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS
GSTREAMER_LIBS = $GSTREAMER_LIBS
ALSA_LIBS = $ALSA_LIBS
OSS4_CFLAGS = $OSS4_CFLAGS
OSS4_LIBS = $OSS4_LIBS
UDEV_CFLAGS = $UDEV_CFLAGS
UDEV_LIBS = $UDEV_LIBS
UNWIND_CFLAGS = $UNWIND_CFLAGS
UNWIND_LIBS = $UNWIND_LIBS
SDL2_CFLAGS = $SDL2_CFLAGS
SDL2_LIBS = $SDL2_LIBS
CAPI20_CFLAGS = $CAPI20_CFLAGS
CAPI20_LIBS = $CAPI20_LIBS
CUPS_CFLAGS = $CUPS_CFLAGS
CUPS_LIBS = $CUPS_LIBS
FONTCONFIG_CFLAGS = $FONTCONFIG_CFLAGS
FONTCONFIG_LIBS = $FONTCONFIG_LIBS
KRB5_CFLAGS = $KRB5_CFLAGS
KRB5_LIBS = $KRB5_LIBS
GSSAPI_CFLAGS = $GSSAPI_CFLAGS
GSSAPI_LIBS = $GSSAPI_LIBS
PROCSTAT_LIBS = $PROCSTAT_LIBS
NETAPI_CFLAGS = $NETAPI_CFLAGS
NETAPI_LIBS = $NETAPI_LIBS
VKD3D_CFLAGS = $VKD3D_CFLAGS
VKD3D_LIBS = $VKD3D_LIBS
VKD3D_SHADER_CFLAGS = $VKD3D_SHADER_CFLAGS
VKD3D_SHADER_LIBS = $VKD3D_SHADER_LIBS
RT_LIBS = $RT_LIBS
LDAP_CFLAGS = $LDAP_CFLAGS
LDAP_LIBS = $LDAP_LIBS
"
makedep_flags=""
test "x$enable_silent_rules" = xyes && makedep_flags="$makedep_flags -S"
...
...
@@ -19903,7 +19821,7 @@ then
Makefile: tools/makedep$ac_exeext"
else
wine_fn_append_rule "\$(MAKEDEP):
@echo \"You need to run make in $
TOOLSDIR
first\" && false"
@echo \"You need to run make in $
toolsdir
first\" && false"
fi
if test -n "$with_wine64"
...
...
@@ -19948,6 +19866,238 @@ server/wineserver"
esac
fi
SHELL=/bin/sh
RUNTESTFLAGS="-q -P wine"
SED_CMD="LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@dlldir@,\${dlldir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'"
api_manext=3w
ALL_VARS_RULES="SHELL = $SHELL
PATH_SEPARATOR = $PATH_SEPARATOR
PACKAGE_NAME = $PACKAGE_NAME
PACKAGE_TARNAME = $PACKAGE_TARNAME
PACKAGE_VERSION = $PACKAGE_VERSION
PACKAGE_STRING = $PACKAGE_STRING
PACKAGE_BUGREPORT = $PACKAGE_BUGREPORT
PACKAGE_URL = $PACKAGE_URL
program_transform_name = $program_transform_name
bindir = $bindir
sbindir = $sbindir
libexecdir = $libexecdir
datarootdir = $datarootdir
datadir = $datadir
sysconfdir = $sysconfdir
sharedstatedir = $sharedstatedir
localstatedir = $localstatedir
runstatedir = $runstatedir
includedir = $includedir
oldincludedir = $oldincludedir
docdir = $docdir
infodir = $infodir
htmldir = $htmldir
dvidir = $dvidir
pdfdir = $pdfdir
psdir = $psdir
libdir = $libdir
localedir = $localedir
mandir = $mandir
DEFS = $DEFS
ECHO_C = $ECHO_C
ECHO_N = $ECHO_N
ECHO_T = $ECHO_T
LIBS = $LIBS
build_alias = $build_alias
host_alias = $host_alias
target_alias = $target_alias
build = $build
build_cpu = $build_cpu
build_vendor = $build_vendor
build_os = $build_os
host = $host
host_cpu = $host_cpu
host_vendor = $host_vendor
host_os = $host_os
dlldir = $dlldir
fontdir = $fontdir
nlsdir = $nlsdir
srcdir = $srcdir
CC = $CC
CFLAGS = $CFLAGS
LDFLAGS = $LDFLAGS
CPPFLAGS = $CPPFLAGS
ac_ct_CC = $ac_ct_CC
EXEEXT = $EXEEXT
OBJEXT = $OBJEXT
CXX = $CXX
CXXFLAGS = $CXXFLAGS
ac_ct_CXX = $ac_ct_CXX
CPPBIN = $CPPBIN
LD = $LD
TARGETFLAGS = $TARGETFLAGS
toolsext = $toolsext
toolsdir = $toolsdir
MAKEDEP = $MAKEDEP
FLEX = $FLEX
BISON = $BISON
AR = $AR
ac_ct_AR = $ac_ct_AR
STRIP = $STRIP
RANLIB = $RANLIB
LN_S = $LN_S
GREP = $GREP
EGREP = $EGREP
LDCONFIG = $LDCONFIG
MSGFMT = $MSGFMT
PKG_CONFIG = $PKG_CONFIG
FONTFORGE = $FONTFORGE
RSVG = $RSVG
CONVERT = $CONVERT
ICOTOOL = $ICOTOOL
I386_LIBS = $I386_LIBS
OPENGL_LIBS = $OPENGL_LIBS
CPP = $CPP
DLLFLAGS = $DLLFLAGS
LDDLLFLAGS = $LDDLLFLAGS
LDEXECFLAGS = $LDEXECFLAGS
EXTRACFLAGS = $EXTRACFLAGS
UNIXDLLFLAGS = $UNIXDLLFLAGS
UNIXLDFLAGS = $UNIXLDFLAGS
TOP_INSTALL_LIB = $TOP_INSTALL_LIB
TOP_INSTALL_DEV = $TOP_INSTALL_DEV
WINELOADER_LDFLAGS = $WINELOADER_LDFLAGS
WINEPRELOADER_LDFLAGS = $WINEPRELOADER_LDFLAGS
LDD = $LDD
OTOOL = $OTOOL
READELF = $READELF
SUBDIRS = $SUBDIRS
DISABLED_SUBDIRS = $DISABLED_SUBDIRS
CONFIGURE_TARGETS = $CONFIGURE_TARGETS
WINELOADER_PROGRAMS = $WINELOADER_PROGRAMS
DLLTOOL = $DLLTOOL
OBJC = $OBJC
OBJCFLAGS = $OBJCFLAGS
ac_ct_OBJC = $ac_ct_OBJC
OBJCPP = $OBJCPP
COREFOUNDATION_LIBS = $COREFOUNDATION_LIBS
IOKIT_LIBS = $IOKIT_LIBS
APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS
CORESERVICES_LIBS = $CORESERVICES_LIBS
APPKIT_LIBS = $APPKIT_LIBS
SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_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
METAL_LIBS = $METAL_LIBS
LIBWINE_SHAREDLIB = $LIBWINE_SHAREDLIB
LIBWINE_LDFLAGS = $LIBWINE_LDFLAGS
WINELOADER_DEPENDS = $WINELOADER_DEPENDS
PRELINK = $PRELINK
LIBWINE_DEPENDS = $LIBWINE_DEPENDS
CROSSTARGET = $CROSSTARGET
CROSSCC = $CROSSCC
CROSSCFLAGS = $CROSSCFLAGS
EXTRACROSSCFLAGS = $EXTRACROSSCFLAGS
CROSSLDFLAGS = $CROSSLDFLAGS
DELAYLOADFLAG = $DELAYLOADFLAG
CROSSDEBUG = $CROSSDEBUG
EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS
FAUDIO_PE_CFLAGS = $FAUDIO_PE_CFLAGS
FAUDIO_PE_LIBS = $FAUDIO_PE_LIBS
GSM_PE_CFLAGS = $GSM_PE_CFLAGS
GSM_PE_LIBS = $GSM_PE_LIBS
JPEG_PE_CFLAGS = $JPEG_PE_CFLAGS
JPEG_PE_LIBS = $JPEG_PE_LIBS
JXR_PE_CFLAGS = $JXR_PE_CFLAGS
JXR_PE_LIBS = $JXR_PE_LIBS
LCMS2_PE_CFLAGS = $LCMS2_PE_CFLAGS
LCMS2_PE_LIBS = $LCMS2_PE_LIBS
MPG123_PE_CFLAGS = $MPG123_PE_CFLAGS
MPG123_PE_LIBS = $MPG123_PE_LIBS
PNG_PE_CFLAGS = $PNG_PE_CFLAGS
PNG_PE_LIBS = $PNG_PE_LIBS
TIFF_PE_CFLAGS = $TIFF_PE_CFLAGS
TIFF_PE_LIBS = $TIFF_PE_LIBS
XML2_PE_CFLAGS = $XML2_PE_CFLAGS
XML2_PE_LIBS = $XML2_PE_LIBS
XSLT_PE_CFLAGS = $XSLT_PE_CFLAGS
XSLT_PE_LIBS = $XSLT_PE_LIBS
ZLIB_PE_CFLAGS = $ZLIB_PE_CFLAGS
ZLIB_PE_LIBS = $ZLIB_PE_LIBS
PTHREAD_LIBS = $PTHREAD_LIBS
XMKMF = $XMKMF
X_CFLAGS = $X_CFLAGS
X_PRE_LIBS = $X_PRE_LIBS
X_LIBS = $X_LIBS
X_EXTRA_LIBS = $X_EXTRA_LIBS
PCAP_LIBS = $PCAP_LIBS
INOTIFY_CFLAGS = $INOTIFY_CFLAGS
INOTIFY_LIBS = $INOTIFY_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
USB_CFLAGS = $USB_CFLAGS
USB_LIBS = $USB_LIBS
GPHOTO2_CFLAGS = $GPHOTO2_CFLAGS
GPHOTO2_LIBS = $GPHOTO2_LIBS
GPHOTO2_PORT_CFLAGS = $GPHOTO2_PORT_CFLAGS
GPHOTO2_PORT_LIBS = $GPHOTO2_PORT_LIBS
RESOLV_LIBS = $RESOLV_LIBS
FREETYPE_CFLAGS = $FREETYPE_CFLAGS
FREETYPE_LIBS = $FREETYPE_LIBS
GETTEXTPO_LIBS = $GETTEXTPO_LIBS
PULSE_CFLAGS = $PULSE_CFLAGS
PULSE_LIBS = $PULSE_LIBS
GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS
GSTREAMER_LIBS = $GSTREAMER_LIBS
ALSA_LIBS = $ALSA_LIBS
OSS4_CFLAGS = $OSS4_CFLAGS
OSS4_LIBS = $OSS4_LIBS
UDEV_CFLAGS = $UDEV_CFLAGS
UDEV_LIBS = $UDEV_LIBS
UNWIND_CFLAGS = $UNWIND_CFLAGS
UNWIND_LIBS = $UNWIND_LIBS
SDL2_CFLAGS = $SDL2_CFLAGS
SDL2_LIBS = $SDL2_LIBS
CAPI20_CFLAGS = $CAPI20_CFLAGS
CAPI20_LIBS = $CAPI20_LIBS
CUPS_CFLAGS = $CUPS_CFLAGS
CUPS_LIBS = $CUPS_LIBS
FONTCONFIG_CFLAGS = $FONTCONFIG_CFLAGS
FONTCONFIG_LIBS = $FONTCONFIG_LIBS
KRB5_CFLAGS = $KRB5_CFLAGS
KRB5_LIBS = $KRB5_LIBS
GSSAPI_CFLAGS = $GSSAPI_CFLAGS
GSSAPI_LIBS = $GSSAPI_LIBS
PROCSTAT_LIBS = $PROCSTAT_LIBS
NETAPI_CFLAGS = $NETAPI_CFLAGS
NETAPI_LIBS = $NETAPI_LIBS
VKD3D_CFLAGS = $VKD3D_CFLAGS
VKD3D_LIBS = $VKD3D_LIBS
VKD3D_SHADER_CFLAGS = $VKD3D_SHADER_CFLAGS
VKD3D_SHADER_LIBS = $VKD3D_SHADER_LIBS
MSVCRTFLAGS = $MSVCRTFLAGS
RT_LIBS = $RT_LIBS
LDAP_CFLAGS = $LDAP_CFLAGS
LDAP_LIBS = $LDAP_LIBS
RUNTESTFLAGS = $RUNTESTFLAGS
SED_CMD = $SED_CMD
api_manext = $api_manext
"
$as_echo " done" >&6
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
27
−
17
View file @
37c0f5c6
...
...
@@ -21,10 +21,6 @@ m4_ifdef([AS_VAR_IF],,[AC_DEFUN([AS_VAR_IF],
[AS_IF([test "x$$1" = x""$2], [$3], [$4])],
[eval as_val=\$$1
AS_IF([test "x$as_val" = x""$2], [$3], [$4])])])])dnl
dnl autoconf versions before 2.64 don't have AC_PACKAGE_URL
m4_ifdef([AC_PACKAGE_URL],,
[AC_DEFINE([PACKAGE_URL], ["https://www.winehq.org"], [Define to the home page for this package.])
AC_SUBST([PACKAGE_URL], ["https://www.winehq.org"])])dnl
dnl **** Command-line arguments ****
...
...
@@ -108,6 +104,11 @@ AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i
AC_CANONICAL_HOST
AC_SUBST(dlldir,[\${libdir}/wine])
AC_SUBST(fontdir,[\${datadir}/wine/fonts])
AC_SUBST(nlsdir,[\${datadir}/wine/nls])
AC_SUBST(srcdir)
dnl **** Check for some programs ****
AC_PROG_MAKE_SET
...
...
@@ -231,6 +232,11 @@ then
--enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.])
fi
case $build_os in
cygwin*|mingw32*) AC_SUBST(toolsext,".exe") ;;
*) AC_SUBST(toolsext,"") ;;
esac
AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
[wine_cv_toolsdir="$with_wine_tools"
if test -z "$with_wine_tools"; then
...
...
@@ -241,16 +247,17 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
fi
fi])
if test -z "$wine_cv_toolsdir"; then
wine_makedep=tools/makedep
AC_SUBST(TOOLSDIR,".")
wine_makedep=tools/makedep$toolsext
elif test -d "$wine_cv_toolsdir/tools/winebuild"; then
wine_makedep=$wine_cv_toolsdir/tools/makedep
AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
wine_makedep=$wine_cv_toolsdir/tools/makedep$toolsext
enable_tools=${enable_tools:-no}
test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir])
else
AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir])
fi
AC_SUBST(toolsdir,[$wine_cv_toolsdir])
AC_SUBST(MAKEDEP,[$wine_makedep])
if test -n "$host_alias" -a "$host_alias" != "$build_alias"
then
TARGETFLAGS="-b $host_alias $TARGETFLAGS"
...
...
@@ -1914,10 +1921,6 @@ fi
dnl **** Platform-specific checks ****
case $build_os in
cygwin*|mingw32*) AC_SUBST(TOOLSEXT,".exe") ;;
esac
case $host_os in
linux*)
case $host_cpu in
...
...
@@ -2396,10 +2399,6 @@ AH_BOTTOM([#endif /* __WINE_CONFIG_H */])
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
])])")
makedep_flags=""
test "x$enable_silent_rules" = xyes && makedep_flags="$makedep_flags -S"
...
...
@@ -3815,7 +3814,7 @@ Makefile: tools/makedep$ac_exeext])
else
WINE_APPEND_RULE(
[\$(MAKEDEP):
@echo \"You need to run make in $
TOOLSDIR
first\" && false])
@echo \"You need to run make in $
toolsdir
first\" && false])
fi
if test -n "$with_wine64"
...
...
@@ -3862,6 +3861,17 @@ server/wineserver"
esac
fi
dnl Makefile variables
AC_SUBST(SHELL,[/bin/sh])
AC_SUBST(RUNTESTFLAGS,["-q -P wine"])
AC_SUBST(SED_CMD,["LC_ALL=C sed -e 's,@bindir@,\${bindir},g' -e 's,@dlldir@,\${dlldir},g' -e 's,@PACKAGE_STRING@,$PACKAGE_STRING,g' -e 's,@PACKAGE_VERSION@,$PACKAGE_VERSION,g'"])
AC_SUBST(api_manext,[3w])
AC_SUBST([ALL_VARS_RULES],
"m4_set_foreach([_AC_SUBST_VARS],[var],[m4_if(m4_bregexp(m4_defn([var]),[\(^SET_MAKE$\|prefix$\)]),-1,[var = $var
])])")
AS_ECHO(" done") >&AS_MESSAGE_FD
AC_OUTPUT
...
...
This diff is collapsed.
Click to expand it.
server/Makefile.in
+
1
−
1
View file @
37c0f5c6
...
...
@@ -51,4 +51,4 @@ MANPAGES = \
EXTRALIBS
=
$(
LDEXECFLAGS
)
$(
RT_LIBS
)
$(
INOTIFY_LIBS
)
unicode_EXTRADEFS
=
-DNLSDIR
=
"
\"
${
nlsdir
}
\"
"
-DBIN_TO_NLSDIR
=
\"
`
$
(
MAKEDEP
)
-R
${
bindir
}
${
nlsdir
}
`
\"
unicode_EXTRADEFS
=
-DNLSDIR
=
"
\"
${
nlsdir
}
\"
"
-DBIN_TO_NLSDIR
=
\"
`
$
{
MAKEDEP
}
-R
${
bindir
}
${
nlsdir
}
`
\"
This diff is collapsed.
Click to expand it.
tools/makedep.c
+
2
−
2
View file @
37c0f5c6
...
...
@@ -4313,8 +4313,8 @@ int main( int argc, char *argv[] )
delay_load_flag
=
get_expanded_make_variable
(
top_makefile
,
"DELAYLOADFLAG"
);
root_src_dir
=
get_expanded_make_variable
(
top_makefile
,
"srcdir"
);
tools_dir
=
get_expanded_make_variable
(
top_makefile
,
"
TOOLSDIR
"
);
tools_ext
=
get_expanded_make_variable
(
top_makefile
,
"
TOOLSEXT
"
);
tools_dir
=
get_expanded_make_variable
(
top_makefile
,
"
toolsdir
"
);
tools_ext
=
get_expanded_make_variable
(
top_makefile
,
"
toolsext
"
);
exe_ext
=
get_expanded_make_variable
(
top_makefile
,
"EXEEXT"
);
man_ext
=
get_expanded_make_variable
(
top_makefile
,
"api_manext"
);
dll_ext
=
(
exe_ext
&&
!
strcmp
(
exe_ext
,
".exe"
))
?
""
:
".so"
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment