Use generic multimedia libname for gkmedias

5 files changed, 5 insertions, 5 deletions

diff --git a/system/evil/moz.build b/system/evil/moz.build
index 0f71103d3..1e907154f 100644
--- a/system/evil/moz.build
+++ b/system/evil/moz.build
@@ -93,8 +93,8 @@ USE_LIBS += [
 ]
 
 USE_LIBS += [
-    'gremedia',
     'lgplmedia',
+    'multimedia',
     'nspr',
     'nss',
     'sqlite',
diff --git a/system/multmedia/gre/Makefile.in b/system/multmedia/build/Makefile.in
index 86d9b181d..86d9b181d 100644
--- a/system/multmedia/gre/Makefile.in
+++ b/system/multmedia/build/Makefile.in
diff --git a/system/multmedia/gre/moz.build b/system/multmedia/build/moz.build
index 556ad2f90..a270b45ea 100644
--- a/system/multmedia/gre/moz.build
+++ b/system/multmedia/build/moz.build
@@ -4,10 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-  GeckoSharedLibrary('gremedia', linkage=None)
+  GeckoSharedLibrary('multimedia', linkage=None)
   USE_LIBS += ['nspr']
 else:
-  Library('gremedia')
+  Library('multimedia')
 
 if CONFIG['OS_TARGET'] == 'WINNT':
   DEFFILE = 'symbols.def'
diff --git a/system/multmedia/gre/symbols.def.in b/system/multmedia/build/symbols.def.in
index 266cb38aa..17cc0b3c5 100644
--- a/system/multmedia/gre/symbols.def.in
+++ b/system/multmedia/build/symbols.def.in
@@ -2,7 +2,7 @@
 ;+# 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/.
 
-LIBRARY gremedia.dll
+LIBRARY multimedia.dll
 EXPORTS
 nestegg_destroy
 nestegg_duration
diff --git a/system/multmedia/moz.build b/system/multmedia/moz.build
index 81fdbb4df..e48211fa2 100644
--- a/system/multmedia/moz.build
+++ b/system/multmedia/moz.build
@@ -3,4 +3,4 @@
 # 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 += ['gre', 'lgpl']
+DIRS += ['build', 'lgpl']