mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1040641 - Ignore AC_SUBSTs for variables we don't have use for but that autoconf itself exports. r=gps
This commit is contained in:
Mike Hommey
parent
33ef4f2c39
commit
e5596407fd
@ -61,7 +61,7 @@ midl_TARGET := export
|
|||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
OS_LIBS = $(call EXPAND_LIBNAME,uuid kernel32 rpcns4 rpcrt4 ole32 oleaut32)
|
OS_LIBS += $(call EXPAND_LIBNAME,uuid kernel32 rpcns4 rpcrt4 ole32 oleaut32)
|
||||||
|
|
||||||
# generate list of to-be-generated files that are missing
|
# generate list of to-be-generated files that are missing
|
||||||
# but ignore special file dlldata.c
|
# but ignore special file dlldata.c
|
||||||
|
|||||||
@ -16,7 +16,7 @@ MIDL_GENERATED_FILES = \
|
|||||||
ISimpleDOMText_i.c \
|
ISimpleDOMText_i.c \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
OS_LIBS = $(call EXPAND_LIBNAME,kernel32 rpcns4 rpcrt4 oleaut32)
|
OS_LIBS += $(call EXPAND_LIBNAME,kernel32 rpcns4 rpcrt4 oleaut32)
|
||||||
|
|
||||||
$(MIDL_GENERATED_FILES): done_gen
|
$(MIDL_GENERATED_FILES): done_gen
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@ DIST_PROGRAM = CommandExecuteHandler$(BIN_SUFFIX)
|
|||||||
MOZ_GLUE_LDFLAGS =
|
MOZ_GLUE_LDFLAGS =
|
||||||
MOZ_GLUE_PROGRAM_LDFLAGS =
|
MOZ_GLUE_PROGRAM_LDFLAGS =
|
||||||
|
|
||||||
OS_LIBS = \
|
OS_LIBS += \
|
||||||
kernel32.lib \
|
kernel32.lib \
|
||||||
user32.lib \
|
user32.lib \
|
||||||
ole32.lib \
|
ole32.lib \
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
include $(topsrcdir)/config/config.mk
|
include $(topsrcdir)/config/config.mk
|
||||||
|
|
||||||
OS_LIBS = \
|
OS_LIBS += \
|
||||||
kernel32.lib \
|
kernel32.lib \
|
||||||
user32.lib \
|
user32.lib \
|
||||||
ole32.lib \
|
ole32.lib \
|
||||||
|
|||||||
@ -8,7 +8,7 @@ MOZ_GLUE_PROGRAM_LDFLAGS =
|
|||||||
|
|
||||||
include $(topsrcdir)/config/config.mk
|
include $(topsrcdir)/config/config.mk
|
||||||
|
|
||||||
OS_LIBS = \
|
OS_LIBS += \
|
||||||
kernel32.lib \
|
kernel32.lib \
|
||||||
user32.lib \
|
user32.lib \
|
||||||
ole32.lib \
|
ole32.lib \
|
||||||
|
|||||||
@ -45,6 +45,16 @@ AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
|
|||||||
AC_DIVERT_POP()dnl
|
AC_DIVERT_POP()dnl
|
||||||
])])])])
|
])])])])
|
||||||
|
|
||||||
|
dnl Ignore AC_SUBSTs for variables we don't have use for but that autoconf
|
||||||
|
dnl itself exports.
|
||||||
|
define([AC_SUBST_CFLAGS], )
|
||||||
|
define([AC_SUBST_CPPFLAGS], )
|
||||||
|
define([AC_SUBST_CXXFLAGS], )
|
||||||
|
define([AC_SUBST_FFLAGS], )
|
||||||
|
define([AC_SUBST_DEFS], )
|
||||||
|
define([AC_SUBST_LDFLAGS], )
|
||||||
|
define([AC_SUBST_LIBS], )
|
||||||
|
|
||||||
dnl Wrap AC_DEFINE to store values in a format suitable for python.
|
dnl Wrap AC_DEFINE to store values in a format suitable for python.
|
||||||
dnl autoconf's AC_DEFINE still needs to be used to fill confdefs.h,
|
dnl autoconf's AC_DEFINE still needs to be used to fill confdefs.h,
|
||||||
dnl which is #included during some compile checks.
|
dnl which is #included during some compile checks.
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
OS_LIBS = $(call EXPAND_LIBNAME,comctl32)
|
OS_LIBS += $(call EXPAND_LIBNAME,comctl32)
|
||||||
|
|
||||||
MOZ_GLUE_LDFLAGS =
|
MOZ_GLUE_LDFLAGS =
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@ ifdef MOZ_WIDGET_GTK
|
|||||||
ifdef MOZ_X11
|
ifdef MOZ_X11
|
||||||
|
|
||||||
LOCAL_INCLUDES = $(TK_CFLAGS)
|
LOCAL_INCLUDES = $(TK_CFLAGS)
|
||||||
OS_LIBS = $(TK_LIBS) $(XSS_LIBS)
|
OS_LIBS += $(TK_LIBS) $(XSS_LIBS)
|
||||||
|
|
||||||
endif # X11
|
endif # X11
|
||||||
endif # GTK
|
endif # GTK
|
||||||
|
|||||||
@ -6,14 +6,16 @@
|
|||||||
|
|
||||||
TEST_DIRS += ['tests']
|
TEST_DIRS += ['tests']
|
||||||
|
|
||||||
for var in ('target', 'ac_configure_args', 'CC', 'CC_VERSION', 'CFLAGS',
|
for var in ('target', 'ac_configure_args', 'CC', 'CC_VERSION',
|
||||||
'CXX', 'CXX_VERSION'):
|
'CXX', 'CXX_VERSION'):
|
||||||
DEFINES[var] = CONFIG[var]
|
DEFINES[var] = CONFIG[var]
|
||||||
|
|
||||||
|
DEFINES['CFLAGS'] = CONFIG['OS_CFLAGS']
|
||||||
|
|
||||||
if CONFIG['OS_TARGET'] == 'Android':
|
if CONFIG['OS_TARGET'] == 'Android':
|
||||||
DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
|
DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
|
||||||
|
|
||||||
if 'stlport' in CONFIG['STLPORT_LIBS']:
|
if 'stlport' in CONFIG['STLPORT_LIBS']:
|
||||||
DEFINES['USE_STLPORT'] = True
|
DEFINES['USE_STLPORT'] = True
|
||||||
|
|
||||||
JAR_MANIFESTS += ['jar.mn']
|
JAR_MANIFESTS += ['jar.mn']
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
OS_LIBS = \
|
OS_LIBS += \
|
||||||
-ldl \
|
-ldl \
|
||||||
-lbfd \
|
-lbfd \
|
||||||
-liberty \
|
-liberty \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user