Backed out changeset 8bbd27688a89 (bug 870406) for Linux bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 16 Jul 2013 16:54:10 -0400
changeset 138756 e97286839337c46c3d136372bce06836437a595b
parent 138755 f38845197c8b35941727c89c8de02d08c8b531d8
child 138757 7d684675747610dde1df2f452b476bca341b734f
push idunknown
push userunknown
push dateunknown
bugs870406
milestone25.0a1
backs out8bbd27688a89a52a0ae41177bc42d57a4fddc54a
Backed out changeset 8bbd27688a89 (bug 870406) for Linux bustage.
mozglue/build/Makefile.in
mozglue/build/moz.build
security/manager/ssl/src/Makefile.in
security/manager/ssl/src/moz.build
tools/trace-malloc/Makefile.in
tools/trace-malloc/lib/Makefile.in
tools/trace-malloc/lib/moz.build
tools/trace-malloc/moz.build
widget/gtk2/Makefile.in
widget/gtk2/moz.build
widget/gtkxtbin/Makefile.in
widget/gtkxtbin/moz.build
widget/shared/x11/Makefile.in
widget/shared/x11/moz.build
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -6,16 +6,17 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 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)))
 FORCE_SHARED_LIB = 1
 else
 FORCE_STATIC_LIB = 1
 endif
 
@@ -89,16 +90,20 @@ endif
 ifeq (android, $(MOZ_WIDGET_TOOLKIT))
 # Add Android specific code
 EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS)
 SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,android,../android)
 # To properly wrap jemalloc's pthread_atfork call.
 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)
 
 ifeq (arm, $(TARGET_CPU))
 EXTRA_DSO_LDOPTS += -Wl,-version-script,$(srcdir)/arm-eabi-filter
 endif
 
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@@ -27,12 +27,8 @@ else:
 
 if CONFIG['OS_TARGET'] == 'Android':
     CPP_SOURCES += [
         'BionicGlue.cpp',
     ]
 
 LIBRARY_NAME = 'mozglue'
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    CSRCS += [
-        'cpuacct.c',
-    ]
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -8,16 +8,17 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY	= 1
+CSRCS += md4.c
 
 DEFINES += \
   -DNSS_ENABLE_ECC \
   -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -61,17 +61,17 @@ CPP_SOURCES += [
     'nsRecentBadCerts.cpp',
     'nsSDR.cpp',
     'NSSErrorsService.cpp',
     'nsSSLSocketProvider.cpp',
     'nsSSLStatus.cpp',
     'nsStreamCipher.cpp',
     'nsTLSSocketProvider.cpp',
     'nsUsageArrayHelper.cpp',
-    'PSMContentListener.cpp',
+	'PSMContentListener.cpp',
     'PSMRunnable.cpp',
     'SharedSSLState.cpp',
     'SSLServerCertVerification.cpp',
     'TransportSecurityInfo.cpp',
 ]
 
 if not CONFIG['MOZ_DISABLE_CRYPTOLEGACY']:
     CPP_SOURCES += [
@@ -80,11 +80,8 @@ if not CONFIG['MOZ_DISABLE_CRYPTOLEGACY'
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'nsCertTree.cpp',
     ]
 
 LIBRARY_NAME = 'pipnss'
 
-CSRCS += [
-    'md4.c',
-]
--- a/tools/trace-malloc/Makefile.in
+++ b/tools/trace-malloc/Makefile.in
@@ -35,16 +35,17 @@ PROGCSRCS = \
   spacetrace.c \
   spacecategory.c \
   formdata.c \
   $(NULL)
 
 PROGOBJS = $(PROGCSRCS:.c=.$(OBJ_SUFFIX))
 endif
 
+CSRCS = $(SIMPLECSRCS) $(EXTRACSRCS) $(PROGCSRCS)
 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES	+= -I$(topsrcdir)/config/os2
 endif
 
 include $(topsrcdir)/config/config.mk
 
 LIBS		+= \
 		$(LIBS_DIR) \
--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@@ -12,16 +12,20 @@ include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
 DEFFILE		= $(win_srcdir)/tm.def
 
 LIBXUL_LIBRARY	= 1
 
 STL_FLAGS	=
 
+CSRCS		= \
+		nsTraceMalloc.c \
+		$(NULL)
+
 DEFINES		+= -DMOZ_NO_MOZALLOC
 
 ifdef WRAP_SYSTEM_INCLUDES
 DEFINES		+= -DWRAP_SYSTEM_INCLUDES
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/tools/trace-malloc/lib/moz.build
+++ b/tools/trace-malloc/lib/moz.build
@@ -17,11 +17,8 @@ CPP_SOURCES += [
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
         'nsDebugHelpWin32.cpp',
         'nsWinTraceMalloc.cpp',
     ]
 
 LIBRARY_NAME = 'tracemalloc'
 
-CSRCS += [
-    'nsTraceMalloc.c',
-]
--- a/tools/trace-malloc/moz.build
+++ b/tools/trace-malloc/moz.build
@@ -1,24 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 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',
-]        
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
@@ -16,21 +16,35 @@ else
 LIBRARY_NAME	= widget_gtk3
 endif
 
 EXPORT_LIBRARY	= 1
 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
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 CFLAGS          += $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
--- a/widget/gtk2/moz.build
+++ b/widget/gtk2/moz.build
@@ -48,22 +48,10 @@ if CONFIG['NS_PRINTING']:
     ]
 
 if CONFIG['MOZ_X11']:
     CPP_SOURCES += [
         'nsClipboard.cpp',
         'nsDragService.cpp',
     ]
 
-CSRCS += [
-    'mozcontainer.c',
+CPP_SOURCES += [
 ]
-
-if CONFIG['ACCESSIBILITY']:
-    CSRCS += [
-        'maiRedundantObjectFactory.c',
-    ]
-
-if CONFIG['MOZ_ENABLE_GTK2']:
-    CSRCS += [
-        'gtk2drawing.c',
-        'gtk3drawing.c',
-    ]
--- a/widget/gtkxtbin/Makefile.in
+++ b/widget/gtkxtbin/Makefile.in
@@ -9,16 +9,22 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 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
 CFLAGS		+= $(MOZ_GTK2_CFLAGS)
 endif
 
 DEFINES		+= -D_IMPL_GTKXTBIN_API
 
--- a/widget/gtkxtbin/moz.build
+++ b/widget/gtkxtbin/moz.build
@@ -7,13 +7,8 @@
 MODULE = 'gtkxtbin'
 
 EXPORTS += [
     'gtk2xtbin.h',
 ]
 
 LIBRARY_NAME = 'gtkxtbin'
 
-
-if CONFIG['MOZ_ENABLE_GTK2']:
-    CSRCS += [
-        'gtk2xtbin.c',
-    ]
--- a/widget/shared/x11/Makefile.in
+++ b/widget/shared/x11/Makefile.in
@@ -8,11 +8,16 @@ topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 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)
--- a/widget/shared/x11/moz.build
+++ b/widget/shared/x11/moz.build
@@ -1,11 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 MODULE = 'widget'
 
-CSRCS += [
-    'keysym2ucs.c',
-]