mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
bug 870406: move CSRCS to mozbuild (file batch #3) r=mshal
This commit is contained in:
parent
38dcd3e297
commit
7457e482c3
@ -11,7 +11,6 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIST_INSTALL = 1
|
||||
|
||||
# Build mozglue as a shared lib on Windows, OSX and Android.
|
||||
# If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
|
||||
ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
|
||||
@ -95,10 +94,6 @@ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,../android)
|
||||
EXTRA_DSO_LDOPTS += -Wl,--wrap=pthread_atfork
|
||||
endif
|
||||
|
||||
ifeq (gonk, $(MOZ_WIDGET_TOOLKIT))
|
||||
CSRCS += cpuacct.c
|
||||
endif
|
||||
|
||||
ifdef MOZ_LINKER
|
||||
# Add custom dynamic linker
|
||||
SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,linker,../linker)
|
||||
|
@ -32,3 +32,7 @@ if CONFIG['OS_TARGET'] == 'Android':
|
||||
|
||||
LIBRARY_NAME = 'mozglue'
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
CSRCS += [
|
||||
'cpuacct.c',
|
||||
]
|
||||
|
@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORT_LIBRARY = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
CSRCS += md4.c
|
||||
|
||||
DEFINES += \
|
||||
-DNSS_ENABLE_ECC \
|
||||
|
@ -66,7 +66,7 @@ CPP_SOURCES += [
|
||||
'nsStreamCipher.cpp',
|
||||
'nsTLSSocketProvider.cpp',
|
||||
'nsUsageArrayHelper.cpp',
|
||||
'PSMContentListener.cpp',
|
||||
'PSMContentListener.cpp',
|
||||
'PSMRunnable.cpp',
|
||||
'SharedSSLState.cpp',
|
||||
'SSLServerCertVerification.cpp',
|
||||
@ -85,3 +85,6 @@ if CONFIG['MOZ_XUL']:
|
||||
|
||||
LIBRARY_NAME = 'pipnss'
|
||||
|
||||
CSRCS += [
|
||||
'md4.c',
|
||||
]
|
||||
|
@ -40,7 +40,6 @@ PROGCSRCS = \
|
||||
PROGOBJS = $(PROGCSRCS:.c=.$(OBJ_SUFFIX))
|
||||
endif
|
||||
|
||||
CSRCS = $(SIMPLECSRCS) $(EXTRACSRCS) $(PROGCSRCS)
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/config/os2
|
||||
endif
|
||||
|
@ -17,10 +17,6 @@ LIBXUL_LIBRARY = 1
|
||||
|
||||
STL_FLAGS =
|
||||
|
||||
CSRCS = \
|
||||
nsTraceMalloc.c \
|
||||
$(NULL)
|
||||
|
||||
DEFINES += -DMOZ_NO_MOZALLOC
|
||||
|
||||
ifdef WRAP_SYSTEM_INCLUDES
|
||||
|
@ -22,3 +22,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
|
||||
LIBRARY_NAME = 'tracemalloc'
|
||||
|
||||
CSRCS += [
|
||||
'nsTraceMalloc.c',
|
||||
]
|
||||
|
@ -6,8 +6,19 @@
|
||||
|
||||
if not CONFIG['MOZ_PROFILE_GENERATE']:
|
||||
PROGRAM = 'spacetrace'
|
||||
CSRCS += [
|
||||
'formdata.c',
|
||||
'spacecategory.c',
|
||||
'spacetrace.c',
|
||||
]
|
||||
|
||||
CPP_SOURCES += [
|
||||
'$(EXTRACPPSRCS)',
|
||||
'$(SIMPLECPPSRCS)',
|
||||
]
|
||||
|
||||
CSRCS += [
|
||||
'leakstats.c',
|
||||
'tmreader.c',
|
||||
'tmstats.c',
|
||||
]
|
||||
|
@ -21,25 +21,11 @@ LIBXUL_LIBRARY = 1
|
||||
|
||||
NATIVE_THEME_SUPPORT = 1
|
||||
|
||||
|
||||
|
||||
CSRCS = \
|
||||
mozcontainer.c \
|
||||
$(NULL)
|
||||
|
||||
ifdef ACCESSIBILITY
|
||||
CSRCS += maiRedundantObjectFactory.c
|
||||
endif
|
||||
# build our subdirs, too
|
||||
|
||||
SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
|
||||
|
||||
ifdef NATIVE_THEME_SUPPORT
|
||||
ifdef MOZ_ENABLE_GTK2
|
||||
CSRCS += gtk2drawing.c
|
||||
else
|
||||
CSRCS += gtk3drawing.c
|
||||
endif
|
||||
DEFINES += -DNATIVE_THEME_SUPPORT
|
||||
endif
|
||||
|
||||
|
@ -53,5 +53,17 @@ if CONFIG['MOZ_X11']:
|
||||
'nsDragService.cpp',
|
||||
]
|
||||
|
||||
CPP_SOURCES += [
|
||||
CSRCS += [
|
||||
'mozcontainer.c',
|
||||
]
|
||||
|
||||
if CONFIG['ACCESSIBILITY']:
|
||||
CSRCS += [
|
||||
'maiRedundantObjectFactory.c',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ENABLE_GTK2']:
|
||||
CSRCS += [
|
||||
'gtk2drawing.c',
|
||||
'gtk3drawing.c',
|
||||
]
|
||||
|
@ -14,12 +14,6 @@ include $(DEPTH)/config/autoconf.mk
|
||||
EXPORT_LIBRARY = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
ifdef MOZ_ENABLE_GTK2
|
||||
CSRCS = \
|
||||
gtk2xtbin.c \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef MOZ_ENABLE_GTK2
|
||||
|
@ -12,3 +12,8 @@ EXPORTS += [
|
||||
|
||||
LIBRARY_NAME = 'gtkxtbin'
|
||||
|
||||
|
||||
if CONFIG['MOZ_ENABLE_GTK2']:
|
||||
CSRCS += [
|
||||
'gtk2xtbin.c',
|
||||
]
|
||||
|
@ -13,11 +13,6 @@ include $(DEPTH)/config/autoconf.mk
|
||||
LIBRARY_NAME = widget_shared_x11
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
CSRCS = \
|
||||
keysym2ucs.c \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
|
@ -6,3 +6,6 @@
|
||||
|
||||
MODULE = 'widget'
|
||||
|
||||
CSRCS += [
|
||||
'keysym2ucs.c',
|
||||
]
|
||||
|
Loading…
Reference in New Issue
Block a user