From f33175df08cc807e310aa5eaaa43d6f51fcb8e57 Mon Sep 17 00:00:00 2001
From: Mike Shal <mshal@mozilla.com>
Date: Mon, 14 Mar 2016 18:02:02 -0400
Subject: [PATCH] Bug 1254950 - Remove several media Makefile.ins; r=ted
 MozReview-Commit-ID: 4dvngHQnH0b

---
 dom/media/gmp-plugin-openh264/Makefile.in | 12 ------------
 dom/media/gmp-plugin-openh264/moz.build   |  6 ++++++
 dom/media/gmp-plugin/Makefile.in          | 13 -------------
 dom/media/gmp-plugin/moz.build            |  8 +++++++-
 media/gmp-clearkey/0.1/Makefile.in        | 10 ----------
 media/gmp-clearkey/0.1/moz.build          |  2 ++
 6 files changed, 15 insertions(+), 36 deletions(-)
 delete mode 100644 dom/media/gmp-plugin-openh264/Makefile.in
 delete mode 100644 dom/media/gmp-plugin/Makefile.in
 delete mode 100644 media/gmp-clearkey/0.1/Makefile.in

diff --git a/dom/media/gmp-plugin-openh264/Makefile.in b/dom/media/gmp-plugin-openh264/Makefile.in
deleted file mode 100644
index eece33e5a237..000000000000
--- a/dom/media/gmp-plugin-openh264/Makefile.in
+++ /dev/null
@@ -1,12 +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/.
-
-INSTALL_TARGETS += FAKE_GMP_OPENH264_PLUGIN
-FAKE_GMP_OPENH264_PLUGIN_DEST = $(DEPTH)/dist/bin/gmp-fakeopenh264/1.0
-FAKE_GMP_OPENH264_PLUGIN_FILES = \
-  $(srcdir)/fakeopenh264.info \
-  $(srcdir)/fakeopenh264.voucher \
-  $(NULL)
-
diff --git a/dom/media/gmp-plugin-openh264/moz.build b/dom/media/gmp-plugin-openh264/moz.build
index 674b07e4ff30..162a6ddbf204 100644
--- a/dom/media/gmp-plugin-openh264/moz.build
+++ b/dom/media/gmp-plugin-openh264/moz.build
@@ -7,6 +7,12 @@
 # largely a copy of dom/media/gmp-fake/moz.build
 
 FINAL_TARGET = 'dist/bin/gmp-fakeopenh264/1.0'
+
+FINAL_TARGET_FILES += [
+    'fakeopenh264.info',
+    'fakeopenh264.voucher',
+]
+
 SOURCES += [
     'gmp-fake-openh264.cpp',
 ]
diff --git a/dom/media/gmp-plugin/Makefile.in b/dom/media/gmp-plugin/Makefile.in
deleted file mode 100644
index 4ac0bc98ede6..000000000000
--- a/dom/media/gmp-plugin/Makefile.in
+++ /dev/null
@@ -1,13 +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/.
-
-INSTALL_TARGETS += FAKE_GMP_PLUGIN
-FAKE_GMP_PLUGIN_DEST = $(DEPTH)/dist/bin/gmp-fake/1.0
-FAKE_GMP_PLUGIN_FILES = \
-  $(SHARED_LIBRARY) \
-  $(srcdir)/fake.info \
-  $(srcdir)/fake.voucher
-
-include $(topsrcdir)/config/rules.mk
diff --git a/dom/media/gmp-plugin/moz.build b/dom/media/gmp-plugin/moz.build
index f7af678a52be..9873f0706bd7 100644
--- a/dom/media/gmp-plugin/moz.build
+++ b/dom/media/gmp-plugin/moz.build
@@ -4,7 +4,13 @@
 # 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/.
 
-DIST_INSTALL = False
+FINAL_TARGET = 'dist/bin/gmp-fake/1.0'
+
+FINAL_TARGET_FILES += [
+    'fake.info',
+    'fake.voucher',
+]
+
 SOURCES += [
         'gmp-fake.cpp',
         'gmp-test-decryptor.cpp',
diff --git a/media/gmp-clearkey/0.1/Makefile.in b/media/gmp-clearkey/0.1/Makefile.in
deleted file mode 100644
index ba8fd21d3d54..000000000000
--- a/media/gmp-clearkey/0.1/Makefile.in
+++ /dev/null
@@ -1,10 +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/.
-
-CLEARKEY_CDM_PATH := $(DEPTH)/dist/bin/gmp-clearkey/0.1
-CLEARKEY_CDM := \
-  clearkey.info.in \
-  $(NULL)
-
-PP_TARGETS := CLEARKEY_CDM
diff --git a/media/gmp-clearkey/0.1/moz.build b/media/gmp-clearkey/0.1/moz.build
index 22edade0dbc8..1be12a56af71 100644
--- a/media/gmp-clearkey/0.1/moz.build
+++ b/media/gmp-clearkey/0.1/moz.build
@@ -8,6 +8,8 @@ SharedLibrary('clearkey')
 
 FINAL_TARGET = 'dist/bin/gmp-clearkey/0.1'
 
+FINAL_TARGET_PP_FILES += ['clearkey.info.in']
+
 UNIFIED_SOURCES += [
     'ClearKeyAsyncShutdown.cpp',
     'ClearKeyBase64.cpp',