bug 870406: move CSRCS to mozbuild (config batch #2) r=mshal

2013-06-04 11:08:44 -04:00 · 2013-06-04 11:08:44 -04:00 · 05956ba0cd
--- a/media/kiss_fft/Makefile.in
+++ b/media/kiss_fft/Makefile.in
@ -13,7 +13,7 @@ LIBRARY_NAME = kiss_fft
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
-CSRCS = kiss_fft.c kiss_fftr.c
+DISABLED_CSRCS = kiss_fft.c kiss_fftr.c

 include $(topsrcdir)/config/rules.mk

--- a/media/kiss_fft/moz.build
+++ b/media/kiss_fft/moz.build
@ -1,3 +1,4 @@
+# -*- 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
@ -10,3 +11,7 @@ EXPORTS.kiss_fft += [
    'kiss_fftr.h',
 ]

+CSRCS += [
+    'kiss_fft.c',
+    'kiss_fftr.c',
+]
--- a/media/libcubeb/src/Makefile.in
+++ b/media/libcubeb/src/Makefile.in
@ -16,12 +16,12 @@ ifeq ($(OS_TARGET),WINNT)
 VISIBILITY_FLAGS =
 endif

-CSRCS           = \
+DISABLED_CSRCS           = \
                cubeb.c \
                $(NULL)

 ifeq ($(OS_TARGET),WINNT)
-CSRCS           += \
+DISABLED_CSRCS           += \
                cubeb_winmm.c \
                $(NULL)
 DEFINES         += -DUSE_WINMM
@ -29,40 +29,40 @@ endif

 ifeq ($(OS_TARGET),Android)
 ifneq ($(MOZ_WIDGET_TOOLKIT),gonk)
-CSRCS           += \
+DISABLED_CSRCS           += \
                cubeb_audiotrack.c \
                $(NULL)
 DEFINES         += -DUSE_AUDIOTRACK
 endif
-CSRCS           += \
+DISABLED_CSRCS           += \
                cubeb_opensl.c \
                $(NULL)
 DEFINES         += -DUSE_OPENSL
 endif

 ifeq ($(OS_TARGET),Darwin)
-CSRCS           += \
+DISABLED_CSRCS           += \
                cubeb_audiounit.c \
                $(NULL)
 DEFINES         += -DUSE_AUDIOUNIT
 endif

 ifeq ($(OS_ARCH),OpenBSD)
-CSRCS           += \
+DISABLED_CSRCS           += \
                cubeb_sndio.c \
                $(NULL)
 DEFINES         += -DUSE_SNDIO
 endif

 ifdef MOZ_ALSA
-CSRCS           += \
+DISABLED_CSRCS           += \
                cubeb_alsa.c \
                $(NULL)
 DEFINES         += -DUSE_ALSA
 endif

 ifdef MOZ_PULSEAUDIO
-CSRCS           += \
+DISABLED_CSRCS           += \
                cubeb_pulse.c \
                $(NULL)
 DEFINES         += -DUSE_PULSE
--- a/media/libcubeb/src/moz.build
+++ b/media/libcubeb/src/moz.build
@ -6,3 +6,40 @@

 MODULE = 'cubeb'

+CSRCS += [
+    'cubeb.c',
+]
+
+if CONFIG['MOZ_ALSA']:
+    CSRCS += [
+        'cubeb_alsa.c',
+    ]
+
+if CONFIG['MOZ_PULSEAUDIO']:
+    CSRCS += [
+        'cubeb_pulse.c',
+    ]
+
+if CONFIG['OS_ARCH'] == 'OpenBSD':
+    CSRCS += [
+        'cubeb_sndio.c',
+    ]
+
+if CONFIG['OS_TARGET'] == 'Darwin':
+    CSRCS += [
+        'cubeb_audiounit.c',
+    ]
+
+if CONFIG['OS_TARGET'] == 'WINNT':
+    CSRCS += [
+        'cubeb_winmm.c',
+    ]
+
+if CONFIG['OS_TARGET'] == 'Android':
+    CSRCS += [
+        'cubeb_opensl.c',
+    ]
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
+        CSRCS += [
+            'cubeb_audiotrack.c',
+        ]
--- a/media/libjpeg/Makefile.in
+++ b/media/libjpeg/Makefile.in
@ -17,7 +17,7 @@ ifeq ($(OS_ARCH),WINNT)
 VISIBILITY_FLAGS	=
 endif

-CSRCS		= \
+DISABLED_CSRCS		= \
 		jcomapi.c \
 		jdapimin.c \
 		jdapistd.c \
@ -52,7 +52,7 @@ CSRCS		= \
 		$(NULL)

 # These files enable support for writing JPEGs
-CSRCS		+= \
+DISABLED_CSRCS		+= \
 		jcapimin.c \
 		jcapistd.c \
 		jccoefct.c \
@ -81,16 +81,16 @@ endif

 # No SIMD support?
 ifeq (,$(LIBJPEG_TURBO_X86_ASM)$(LIBJPEG_TURBO_X64_ASM)$(LIBJPEG_TURBO_ARM_ASM))
-  CSRCS += jsimd_none.c
+  DISABLED_CSRCS += jsimd_none.c
 endif

 ifeq (1,$(LIBJPEG_TURBO_ARM_ASM))
-  CSRCS += simd/jsimd_arm.c
+  DISABLED_CSRCS += simd/jsimd_arm.c
  SSRCS += simd/jsimd_arm_neon.S
 endif

 ifeq (1,$(LIBJPEG_TURBO_X64_ASM))
-  CSRCS   += simd/jsimd_x86_64.c
+  DISABLED_CSRCS   += simd/jsimd_x86_64.c
  DISABLED_ASFILES += \
 	simd/jccolss2-64.asm \
 	simd/jcgrass2-64.asm \
@ -111,7 +111,7 @@ ifeq (1,$(LIBJPEG_TURBO_X64_ASM))
 endif

 ifeq (1,$(LIBJPEG_TURBO_X86_ASM))
-  CSRCS   +=simd/jsimd_i386.c
+  DISABLED_CSRCS   +=simd/jsimd_i386.c
  DISABLED_ASFILES += \
 	simd/jccolmmx.asm \
 	simd/jccolss2.asm \
--- a/media/libjpeg/moz.build
+++ b/media/libjpeg/moz.build
@ -73,3 +73,74 @@ if CONFIG['LIBJPEG_TURBO_X86_ASM']:
        'simd/jisseflt.asm',
        'simd/jsimdcpu.asm',
 ]
+
+CSRCS += [
+    'jcomapi.c',
+    'jdapimin.c',
+    'jdapistd.c',
+    'jdatadst.c',
+    'jdatasrc.c',
+    'jdcoefct.c',
+    'jdcolor.c',
+    'jddctmgr.c',
+    'jdhuff.c',
+    'jdinput.c',
+    'jdmainct.c',
+    'jdmarker.c',
+    'jdmaster.c',
+    'jdmerge.c',
+    'jdphuff.c',
+    'jdpostct.c',
+    'jdsample.c',
+    'jdtrans.c',
+    'jerror.c',
+    'jfdctflt.c',
+    'jfdctfst.c',
+    'jfdctint.c',
+    'jidctflt.c',
+    'jidctfst.c',
+    'jidctint.c',
+    'jidctred.c',
+    'jmemmgr.c',
+    'jmemnobs.c',
+    'jquant1.c',
+    'jquant2.c',
+    'jutils.c',
+]
+
+# These files enable support for writing JPEGs
+CSRCS += [
+    'jcapimin.c',
+    'jcapistd.c',
+    'jccoefct.c',
+    'jccolor.c',
+    'jcdctmgr.c',
+    'jchuff.c',
+    'jcinit.c',
+    'jcmainct.c',
+    'jcmarker.c',
+    'jcmaster.c',
+    'jcparam.c',
+    'jcphuff.c',
+    'jcprepct.c',
+    'jcsample.c',
+    'jctrans.c',
+]
+
+
+if CONFIG['LIBJPEG_TURBO_ARM_ASM']:
+    CSRCS += [
+        'simd/jsimd_arm.c',
+    ]
+elif CONFIG['LIBJPEG_TURBO_X64_ASM']:
+    CSRCS += [
+        'simd/jsimd_x86_64.c',
+    ]
+elif CONFIG['LIBJPEG_TURBO_X86_ASM']:
+    CSRCS += [
+        'simd/jsimd_i386.c',
+    ]
+else: # No SIMD support?
+    CSRCS += [
+        'jsimd_none.c',
+    ]
--- a/media/libnestegg/src/Makefile.in
+++ b/media/libnestegg/src/Makefile.in
@ -16,7 +16,7 @@ ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif

-CSRCS		= \
+DISABLED_CSRCS		= \
 		nestegg.c \
 		halloc.c \
 		$(NULL)
--- a/media/libnestegg/src/moz.build
+++ b/media/libnestegg/src/moz.build
@ -6,3 +6,7 @@

 MODULE = 'nestegg'

+CSRCS += [
+    'halloc.c',
+    'nestegg.c',
+]
--- a/media/libogg/src/Makefile.in
+++ b/media/libogg/src/Makefile.in
@ -16,7 +16,7 @@ ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif

-CSRCS		= \
+DISABLED_CSRCS		= \
 		ogg_bitwise.c \
 		ogg_framing.c \
 		$(NULL)
--- a/media/libogg/src/moz.build
+++ b/media/libogg/src/moz.build
@ -6,3 +6,7 @@

 MODULE = 'ogg'

+CSRCS += [
+    'ogg_bitwise.c',
+    'ogg_framing.c',
+]
--- a/media/libpng/Makefile.in
+++ b/media/libpng/Makefile.in
@ -18,7 +18,7 @@ VISIBILITY_FLAGS=
 endif


-CSRCS		= \
+DISABLED_CSRCS		= \
 		png.c \
 		pngerror.c \
 		pngget.c \
@ -28,7 +28,7 @@ CSRCS		= \
 		$(NULL)

 # These files enable support for reading/writing PNGs
-CSRCS		+= \
+DISABLED_CSRCS		+= \
 		pngpread.c \
 		pngread.c \
 		pngrio.c \
--- a/media/libpng/moz.build
+++ b/media/libpng/moz.build
@ -12,3 +12,24 @@ EXPORTS += [
    'pngconf.h',
 ]

+CSRCS += [
+    'png.c',
+    'pngerror.c',
+    'pngget.c',
+    'pngmem.c',
+    'pngset.c',
+    'pngtrans.c',
+]
+
+# These files enable support for reading/writing PNGs
+CSRCS += [
+    'pngpread.c',
+    'pngread.c',
+    'pngrio.c',
+    'pngrtran.c',
+    'pngrutil.c',
+    'pngwio.c',
+    'pngwrite.c',
+    'pngwtran.c',
+    'pngwutil.c',
+]
--- a/memory/build/Makefile.in
+++ b/memory/build/Makefile.in
@ -19,13 +19,13 @@ endif

 DEFINES += -DMOZ_MEMORY_IMPL

-CSRCS = \
+DISABLED_CSRCS = \
  mozmemory_wrap.c \
  jemalloc_config.c \
  $(NULL)

 ifdef MOZ_JEMALLOC3
-CSRCS += mozjemalloc_compat.c
+DISABLED_CSRCS += mozjemalloc_compat.c
 LOCAL_INCLUDES += -I../jemalloc/src/include
 ifdef _MSC_VER
 LOCAL_INCLUDES += -I$(topsrcdir)/memory/jemalloc/src/include/msvc_compat
@ -40,7 +40,7 @@ endif

 ifdef MOZ_REPLACE_MALLOC
 DEFINES += -DMOZ_REPLACE_MALLOC
-CSRCS += replace_malloc.c
+DISABLED_CSRCS += replace_malloc.c

 # The zone allocator for OSX needs some jemalloc internal functions
 ifeq (Darwin,$(OS_TARGET))
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@ -16,3 +16,17 @@ if CONFIG['MOZ_REPLACE_MALLOC']:
        'malloc_decls.h',
        'replace_malloc.h',
    ]
+CSRCS += [
+    'jemalloc_config.c',
+    'mozmemory_wrap.c',
+]
+
+if CONFIG['MOZ_JEMALLOC3']:
+    CSRCS += [
+        'mozjemalloc_compat.c',
+    ]
+
+if CONFIG['MOZ_REPLACE_MALLOC']:
+    CSRCS += [
+        'replace_malloc.c',
+    ]
--- a/memory/jemalloc/Makefile.in
+++ b/memory/jemalloc/Makefile.in
@ -18,11 +18,11 @@ SDK_LIBRARY = $(REAL_LIBRARY)
 DIST_INSTALL = 1
 endif

-CSRCS := $(notdir $(wildcard $(srcdir)/src/src/*.c))
+DISABLED_CSRCS := $(notdir $(wildcard $(srcdir)/src/src/*.c))
 # Only OSX needs the zone allocation implementation, but only if
 # replace-malloc is not enabled.
 ifneq ($(OS_TARGET)$(MOZ_REPLACE_MALLOC),Darwin)
-CSRCS := $(filter-out zone.c,$(CSRCS))
+DISABLED_CSRCS := $(filter-out zone.c,$(CSRCS))
 endif

 include $(topsrcdir)/config/rules.mk
--- a/memory/jemalloc/moz.build
+++ b/memory/jemalloc/moz.build
@ -6,3 +6,34 @@

 MODULE = 'jemalloc'

+CSRCS += [
+    'arena.c',
+    'atomic.c',
+    'base.c',
+    'bitmap.c',
+    'chunk.c',
+    'chunk_dss.c',
+    'chunk_mmap.c',
+    'ckh.c',
+    'ctl.c',
+    'extent.c',
+    'hash.c',
+    'huge.c',
+    'jemalloc.c',
+    'mb.c',
+    'mutex.c',
+    'prof.c',
+    'quarantine.c',
+    'rtree.c',
+    'stats.c',
+    'tcache.c',
+    'tsd.c',
+    'util.c',
+]
+
+# Only OSX needs the zone allocation implementation,
+# but only if replace-malloc is not enabled.
+if CONFIG['OS_TARGET'] == 'Darwin' and not CONFIG['MOZ_REPLACE_MALLOC']:
+    CSRCS += [
+        'zone.c',
+    ]
--- a/memory/mozjemalloc/Makefile.in
+++ b/memory/mozjemalloc/Makefile.in
@ -11,7 +11,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 ifndef MOZ_JEMALLOC3
-CSRCS = jemalloc.c
+DISABLED_CSRCS = jemalloc.c

 LIBRARY_NAME = jemalloc
 FORCE_STATIC_LIB= 1
--- a/memory/mozjemalloc/moz.build
+++ b/memory/mozjemalloc/moz.build
@ -10,3 +10,7 @@ EXPORTS += [
    'jemalloc_types.h',
 ]

+if not CONFIG['MOZ_JEMALLOC3']:
+    CSRCS += [
+        'jemalloc.c',
+    ]
--- a/memory/replace/dmd/Makefile.in
+++ b/memory/replace/dmd/Makefile.in
@ -17,7 +17,7 @@ DEFINES 	+= -DMOZ_NO_MOZALLOC

 VPATH 		+= $(topsrcdir)/xpcom/base
 VPATH 		+= $(topsrcdir)/nsprpub/lib/libc/src
-CSRCS 		+= strcpy.c
+DISABLED_CSRCS 		+= strcpy.c

 VPATH 		+= $(topsrcdir)/mfbt

--- a/memory/replace/dmd/moz.build
+++ b/memory/replace/dmd/moz.build
@ -16,3 +16,6 @@ CPP_SOURCES += [
    'nsStackWalk.cpp',
 ]

+CSRCS += [
+    'strcpy.c',
+]
--- a/memory/replace/dummy/Makefile.in
+++ b/memory/replace/dummy/Makefile.in
@ -13,6 +13,6 @@ LIBRARY_NAME = replace_malloc
 FORCE_SHARED_LIB = 1
 NO_DIST_INSTALL = 1

-CSRCS = dummy_replace_malloc.c
+DISABLED_CSRCS = dummy_replace_malloc.c

 include $(topsrcdir)/config/rules.mk
--- a/memory/replace/dummy/moz.build
+++ b/memory/replace/dummy/moz.build
@ -6,3 +6,6 @@

 MODULE = 'memory'

+CSRCS += [
+    'dummy_replace_malloc.c',
+]
--- a/memory/replace/jemalloc/Makefile.in
+++ b/memory/replace/jemalloc/Makefile.in
@ -22,7 +22,7 @@ endif

 VPATH += $(topsrcdir)/memory/build

-CSRCS = \
+DISABLED_CSRCS = \
  mozjemalloc_compat.c \
  jemalloc_config.c \
  $(NULL)
@ -34,7 +34,7 @@ WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap
 # It shouldn't make much problem, as the use of fork is pretty limited on
 # Android.
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-CSRCS += pthread_atfork.c
+DISABLED_CSRCS += pthread_atfork.c
 endif

 include $(topsrcdir)/config/rules.mk
--- a/memory/replace/jemalloc/moz.build
+++ b/memory/replace/jemalloc/moz.build
@ -6,3 +6,15 @@

 MODULE = 'memory'

+CSRCS += [
+    'jemalloc_config.c',
+    'mozjemalloc_compat.c',
+]
+
+# Android doesn't have pthread_atfork, so just implement a dummy function.
+# It shouldn't make much problem, as the use of fork is pretty limited on
+# Android.
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    CSRCS += [
+        'pthread_atfork.c',
+    ]