Bug 930228 - Consolidate vorbis build files. r=ted
authorRalph Giles <giles@mozilla.com>
Wed, 23 Oct 2013 14:52:00 -0700
changeset 152612 2f86ab651d78ad424d7970268099c9174dd6f4d4
parent 152611 773544d9c681f4e7b89d4b79ad5e975f1c5f4823
child 152613 2c6772af1393c8279a803e60b5c913c22988509a
push id35593
push userrgiles@mozilla.com
push dateTue, 29 Oct 2013 10:07:09 +0000
treeherdermozilla-inbound@cdd6ecfa8487 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs930228
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 930228 - Consolidate vorbis build files. r=ted Replace recursive build files with a single pair in the top level source for better readability and parse time.
layout/media/Makefile.in
media/libvorbis/Makefile.in
media/libvorbis/include/moz.build
media/libvorbis/include/vorbis/moz.build
media/libvorbis/lib/Makefile.in
media/libvorbis/lib/moz.build
media/libvorbis/moz.build
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -20,17 +20,17 @@ SHARED_LIBRARY_LIBS += $(MOZ_CAIRO_LIBS)
 endif
 
 ifdef MOZ_TREE_PIXMAN
 SHARED_LIBRARY_LIBS += $(MOZ_PIXMAN_LIBS)
 endif
 
 ifdef MOZ_VORBIS
 SHARED_LIBRARY_LIBS 	+= \
-	$(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
+	$(DEPTH)/media/libvorbis/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
 	$(DEPTH)/media/libogg/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
 ifdef MOZ_TREMOR
 SHARED_LIBRARY_LIBS	+= \
 	$(DEPTH)/media/libtremor/lib/$(LIB_PREFIX)tremor.$(LIB_SUFFIX) \
 	$(DEPTH)/media/libogg/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
new file mode 100644
--- /dev/null
+++ b/media/libvorbis/Makefile.in
@@ -0,0 +1,7 @@
+# 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/.
+
+ifeq ($(OS_ARCH),AIX)
+DEFINES += -Dalloca=__alloca
+endif
deleted file mode 100644
--- a/media/libvorbis/include/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- 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/.
-
-DIRS += ['vorbis']
-
-MODULE = 'vorbis'
-
deleted file mode 100644
--- a/media/libvorbis/include/vorbis/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- 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/.
-
-EXPORTS.vorbis += [
-    'codec.h',
-]
-
deleted file mode 100644
--- a/media/libvorbis/lib/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/.
-
-
-ifeq ($(OS_ARCH),AIX)
-DEFINES += -Dalloca=__alloca
-endif
deleted file mode 100644
--- a/media/libvorbis/lib/moz.build
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- 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 = 'vorbis'
-
-LIBRARY_NAME = 'vorbis'
-
-SOURCES += [
-    'vorbis_analysis.c',
-    'vorbis_bitrate.c',
-    'vorbis_block.c',
-    'vorbis_codebook.c',
-    'vorbis_envelope.c',
-    'vorbis_floor0.c',
-    'vorbis_floor1.c',
-    'vorbis_info.c',
-    'vorbis_lookup.c',
-    'vorbis_lpc.c',
-    'vorbis_lsp.c',
-    'vorbis_mapping0.c',
-    'vorbis_mdct.c',
-    'vorbis_psy.c',
-    'vorbis_registry.c',
-    'vorbis_res0.c',
-    'vorbis_sharedbook.c',
-    'vorbis_smallft.c',
-    'vorbis_synthesis.c',
-    'vorbis_window.c',
-]
-
-MSVC_ENABLE_PGO = True
-
-FORCE_STATIC_LIB = True
-
-if CONFIG['OS_TARGET'] == 'WINNT':
-    NO_VISIBILITY_FLAGS = True
--- a/media/libvorbis/moz.build
+++ b/media/libvorbis/moz.build
@@ -1,10 +1,43 @@
 # -*- 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/.
 
-DIRS += ['include', 'lib']
-
 MODULE = 'vorbis'
 
+EXPORTS.vorbis += [
+    'include/vorbis/codec.h',
+]
+
+LIBRARY_NAME = 'vorbis'
+
+SOURCES += [
+    'lib/vorbis_analysis.c',
+    'lib/vorbis_bitrate.c',
+    'lib/vorbis_block.c',
+    'lib/vorbis_codebook.c',
+    'lib/vorbis_envelope.c',
+    'lib/vorbis_floor0.c',
+    'lib/vorbis_floor1.c',
+    'lib/vorbis_info.c',
+    'lib/vorbis_lookup.c',
+    'lib/vorbis_lpc.c',
+    'lib/vorbis_lsp.c',
+    'lib/vorbis_mapping0.c',
+    'lib/vorbis_mdct.c',
+    'lib/vorbis_psy.c',
+    'lib/vorbis_registry.c',
+    'lib/vorbis_res0.c',
+    'lib/vorbis_sharedbook.c',
+    'lib/vorbis_smallft.c',
+    'lib/vorbis_synthesis.c',
+    'lib/vorbis_window.c',
+]
+
+MSVC_ENABLE_PGO = True
+
+FORCE_STATIC_LIB = True
+
+if CONFIG['OS_TARGET'] == 'WINNT':
+    NO_VISIBILITY_FLAGS = True