Bug 930242 - Consolidate ogg moz.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

@@ -26,14 +26,14 @@ endif
 ifdef MOZ_VORBIS
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
-	$(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(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/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
+	$(DEPTH)/media/libogg/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 

media/libogg/README_MOZILLA

@@ -1,7 +1,7 @@
 The source from this directory was copied from the libogg subversion
 repository using the update.sh script. The only changes made were
-those applied by update.sh and the addition/upate of Makefile.in files
-for the Mozilla build system.
+those applied by update.sh and the addition/update of moz.build and
+Makefile.in files for the Mozilla build system.
 
 The svn revision number used was r17287.
 

media/libogg/include/moz.build

@@ -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 += ['ogg']
-
-MODULE = 'ogg'
-

media/libogg/include/ogg/moz.build

@@ -1,12 +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.ogg += [
-    'config_types.h',
-    'ogg.h',
-    'os_types.h',
-]
-

media/libogg/moz.build

@@ -4,7 +4,24 @@
 # 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', 'src']
-
 MODULE = 'ogg'
 
+EXPORTS.ogg += [
+    'include/ogg/config_types.h',
+    'include/ogg/ogg.h',
+    'include/ogg/os_types.h',
+]
+
+LIBRARY_NAME = 'ogg'
+
+SOURCES += [
+    'src/ogg_bitwise.c',
+    'src/ogg_framing.c',
+]
+
+MSVC_ENABLE_PGO = True
+
+FORCE_STATIC_LIB = True
+
+if CONFIG['OS_TARGET'] == 'WINNT':
+    NO_VISIBILITY_FLAGS = True

media/libogg/src/Makefile.in

@@ -1,4 +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/.
-