Replace dom/media/gmp-plugin-openh264/Makefile.in with FINAL_TARGET_FILES. r?gps draft
authorTed Mielczarek <ted@mielczarek.org>
Wed, 11 Nov 2015 16:35:29 -0500
changeset 308403 d2c528aea715b1dded0e7678b9bf4779089af200
parent 308402 d907da8143d7a59b6bf3857106abd83dadec9291
child 308404 a351deee43e9cc8dfb1759170eea1773f79b5656
push id7469
push usertmielczarek@mozilla.com
push dateThu, 12 Nov 2015 11:53:46 +0000
reviewersgps
milestone45.0a1
Replace dom/media/gmp-plugin-openh264/Makefile.in with FINAL_TARGET_FILES. r?gps
dom/media/gmp-plugin-openh264/Makefile.in
dom/media/gmp-plugin-openh264/moz.build
deleted file mode 100644
--- 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)
-
--- a/dom/media/gmp-plugin-openh264/moz.build
+++ b/dom/media/gmp-plugin-openh264/moz.build
@@ -2,16 +2,21 @@
 # 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/.
 
 # 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',
 ]
 
 SharedLibrary("fakeopenh264")
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     OS_LIBS += [