From 54f3d2f111121bdd9e2b90b0fb26800a442f0ee1 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 16 Jul 2013 16:54:10 -0400 Subject: [PATCH] Backed out changeset 8bbd27688a89 (bug 870406) for Linux bustage. --- mozglue/build/Makefile.in | 5 +++++ mozglue/build/moz.build | 4 ---- security/manager/ssl/src/Makefile.in | 1 + security/manager/ssl/src/moz.build | 5 +---- tools/trace-malloc/Makefile.in | 1 + tools/trace-malloc/lib/Makefile.in | 4 ++++ tools/trace-malloc/lib/moz.build | 3 --- tools/trace-malloc/moz.build | 11 ----------- widget/gtk2/Makefile.in | 14 ++++++++++++++ widget/gtk2/moz.build | 14 +------------- widget/gtkxtbin/Makefile.in | 6 ++++++ widget/gtkxtbin/moz.build | 5 ----- widget/shared/x11/Makefile.in | 5 +++++ widget/shared/x11/moz.build | 3 --- 14 files changed, 38 insertions(+), 43 deletions(-) diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in index 92ab99b5d7d..33c19d64141 100644 --- a/mozglue/build/Makefile.in +++ b/mozglue/build/Makefile.in @@ -11,6 +11,7 @@ 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))) @@ -94,6 +95,10 @@ 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) diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build index f578d1fe063..0671669107b 100644 --- a/mozglue/build/moz.build +++ b/mozglue/build/moz.build @@ -32,7 +32,3 @@ if CONFIG['OS_TARGET'] == 'Android': LIBRARY_NAME = 'mozglue' -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - CSRCS += [ - 'cpuacct.c', - ] diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in index 90522586ac2..2b578ee4f13 100644 --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -13,6 +13,7 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 +CSRCS += md4.c DEFINES += \ -DNSS_ENABLE_ECC \ diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build index 9400550c75e..1e7954184c0 100644 --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build @@ -66,7 +66,7 @@ CPP_SOURCES += [ 'nsStreamCipher.cpp', 'nsTLSSocketProvider.cpp', 'nsUsageArrayHelper.cpp', - 'PSMContentListener.cpp', + 'PSMContentListener.cpp', 'PSMRunnable.cpp', 'SharedSSLState.cpp', 'SSLServerCertVerification.cpp', @@ -85,6 +85,3 @@ if CONFIG['MOZ_XUL']: LIBRARY_NAME = 'pipnss' -CSRCS += [ - 'md4.c', -] diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in index 1ac45d3279a..999b7763667 100644 --- a/tools/trace-malloc/Makefile.in +++ b/tools/trace-malloc/Makefile.in @@ -40,6 +40,7 @@ PROGCSRCS = \ PROGOBJS = $(PROGCSRCS:.c=.$(OBJ_SUFFIX)) endif +CSRCS = $(SIMPLECSRCS) $(EXTRACSRCS) $(PROGCSRCS) ifeq ($(OS_ARCH),WINNT) LOCAL_INCLUDES += -I$(topsrcdir)/config/os2 endif diff --git a/tools/trace-malloc/lib/Makefile.in b/tools/trace-malloc/lib/Makefile.in index afa8a2a139d..b46b484855d 100644 --- a/tools/trace-malloc/lib/Makefile.in +++ b/tools/trace-malloc/lib/Makefile.in @@ -17,6 +17,10 @@ LIBXUL_LIBRARY = 1 STL_FLAGS = +CSRCS = \ + nsTraceMalloc.c \ + $(NULL) + DEFINES += -DMOZ_NO_MOZALLOC ifdef WRAP_SYSTEM_INCLUDES diff --git a/tools/trace-malloc/lib/moz.build b/tools/trace-malloc/lib/moz.build index 747fe542a4e..c4e57073c75 100644 --- a/tools/trace-malloc/lib/moz.build +++ b/tools/trace-malloc/lib/moz.build @@ -22,6 +22,3 @@ if CONFIG['OS_ARCH'] == 'WINNT': LIBRARY_NAME = 'tracemalloc' -CSRCS += [ - 'nsTraceMalloc.c', -] diff --git a/tools/trace-malloc/moz.build b/tools/trace-malloc/moz.build index c8211ebf4af..c4fc5e83815 100644 --- a/tools/trace-malloc/moz.build +++ b/tools/trace-malloc/moz.build @@ -6,19 +6,8 @@ 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', -] diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in index 6840d505a7d..903286d02c9 100644 --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in @@ -21,11 +21,25 @@ 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 diff --git a/widget/gtk2/moz.build b/widget/gtk2/moz.build index 09fc648710e..6a7fea1d577 100644 --- a/widget/gtk2/moz.build +++ b/widget/gtk2/moz.build @@ -53,17 +53,5 @@ if CONFIG['MOZ_X11']: 'nsDragService.cpp', ] -CSRCS += [ - 'mozcontainer.c', +CPP_SOURCES += [ ] - -if CONFIG['ACCESSIBILITY']: - CSRCS += [ - 'maiRedundantObjectFactory.c', - ] - -if CONFIG['MOZ_ENABLE_GTK2']: - CSRCS += [ - 'gtk2drawing.c', - 'gtk3drawing.c', - ] diff --git a/widget/gtkxtbin/Makefile.in b/widget/gtkxtbin/Makefile.in index 66cca4104a6..a1ba37e3a37 100644 --- a/widget/gtkxtbin/Makefile.in +++ b/widget/gtkxtbin/Makefile.in @@ -14,6 +14,12 @@ 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 diff --git a/widget/gtkxtbin/moz.build b/widget/gtkxtbin/moz.build index 6004ca683f8..5e9a3c87c1a 100644 --- a/widget/gtkxtbin/moz.build +++ b/widget/gtkxtbin/moz.build @@ -12,8 +12,3 @@ EXPORTS += [ LIBRARY_NAME = 'gtkxtbin' - -if CONFIG['MOZ_ENABLE_GTK2']: - CSRCS += [ - 'gtk2xtbin.c', - ] diff --git a/widget/shared/x11/Makefile.in b/widget/shared/x11/Makefile.in index a96382d4b85..819b6fc06f3 100644 --- a/widget/shared/x11/Makefile.in +++ b/widget/shared/x11/Makefile.in @@ -13,6 +13,11 @@ 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) diff --git a/widget/shared/x11/moz.build b/widget/shared/x11/moz.build index 493294822e1..41a76827ca6 100644 --- a/widget/shared/x11/moz.build +++ b/widget/shared/x11/moz.build @@ -6,6 +6,3 @@ MODULE = 'widget' -CSRCS += [ - 'keysym2ucs.c', -]