From 7457e482c30a6ccf682e2913d88d0ff7b119c115 Mon Sep 17 00:00:00 2001 From: Joey Armstrong Date: Tue, 16 Jul 2013 15:47:52 -0400 Subject: [PATCH] bug 870406: move CSRCS to mozbuild (file batch #3) r=mshal --- 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, 43 insertions(+), 38 deletions(-) diff --git a/mozglue/build/Makefile.in b/mozglue/build/Makefile.in index 33c19d64141..92ab99b5d7d 100644 --- a/mozglue/build/Makefile.in +++ b/mozglue/build/Makefile.in @@ -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) diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build index 0671669107b..f578d1fe063 100644 --- a/mozglue/build/moz.build +++ b/mozglue/build/moz.build @@ -32,3 +32,7 @@ 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 2b578ee4f13..90522586ac2 100644 --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -13,7 +13,6 @@ 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 1e7954184c0..9400550c75e 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,3 +85,6 @@ 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 999b7763667..1ac45d3279a 100644 --- a/tools/trace-malloc/Makefile.in +++ b/tools/trace-malloc/Makefile.in @@ -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 diff --git a/tools/trace-malloc/lib/Makefile.in b/tools/trace-malloc/lib/Makefile.in index b46b484855d..afa8a2a139d 100644 --- a/tools/trace-malloc/lib/Makefile.in +++ b/tools/trace-malloc/lib/Makefile.in @@ -17,10 +17,6 @@ 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 c4e57073c75..747fe542a4e 100644 --- a/tools/trace-malloc/lib/moz.build +++ b/tools/trace-malloc/lib/moz.build @@ -22,3 +22,6 @@ 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 c4fc5e83815..c8211ebf4af 100644 --- a/tools/trace-malloc/moz.build +++ b/tools/trace-malloc/moz.build @@ -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', +] diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in index 903286d02c9..6840d505a7d 100644 --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in @@ -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 diff --git a/widget/gtk2/moz.build b/widget/gtk2/moz.build index 6a7fea1d577..09fc648710e 100644 --- a/widget/gtk2/moz.build +++ b/widget/gtk2/moz.build @@ -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', + ] diff --git a/widget/gtkxtbin/Makefile.in b/widget/gtkxtbin/Makefile.in index a1ba37e3a37..66cca4104a6 100644 --- a/widget/gtkxtbin/Makefile.in +++ b/widget/gtkxtbin/Makefile.in @@ -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 diff --git a/widget/gtkxtbin/moz.build b/widget/gtkxtbin/moz.build index 5e9a3c87c1a..6004ca683f8 100644 --- a/widget/gtkxtbin/moz.build +++ b/widget/gtkxtbin/moz.build @@ -12,3 +12,8 @@ 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 819b6fc06f3..a96382d4b85 100644 --- a/widget/shared/x11/Makefile.in +++ b/widget/shared/x11/Makefile.in @@ -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) diff --git a/widget/shared/x11/moz.build b/widget/shared/x11/moz.build index 41a76827ca6..493294822e1 100644 --- a/widget/shared/x11/moz.build +++ b/widget/shared/x11/moz.build @@ -6,3 +6,6 @@ MODULE = 'widget' +CSRCS += [ + 'keysym2ucs.c', +]