From fc3992d3d61be6310018ccb404579ddce4b4d243 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Thu, 26 Feb 2015 14:11:38 -0500 Subject: [PATCH] Bug 1137364 - part 2 - move browser themes icon installation to FINAL_TARGET_FILES; r=mshal Moving this to FINAL_TARGET_FILES also provides an excellent opportunity to reduce duplication between the theme directories. --- browser/themes/linux/Makefile.in | 7 ------- browser/themes/moz.build | 2 ++ browser/themes/osx/Makefile.in | 7 ------- browser/themes/windows/Makefile.in | 7 ------- 4 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 browser/themes/linux/Makefile.in delete mode 100644 browser/themes/osx/Makefile.in delete mode 100644 browser/themes/windows/Makefile.in diff --git a/browser/themes/linux/Makefile.in b/browser/themes/linux/Makefile.in deleted file mode 100644 index bf6869d2c09a..000000000000 --- a/browser/themes/linux/Makefile.in +++ /dev/null @@ -1,7 +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/. - -ICON_FILES := ../shared/icon.png -ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -INSTALL_TARGETS += ICON diff --git a/browser/themes/moz.build b/browser/themes/moz.build index 5040c10c15cd..cca815ff9972 100644 --- a/browser/themes/moz.build +++ b/browser/themes/moz.build @@ -12,3 +12,5 @@ elif toolkit in ('gtk2', 'gtk3', 'qt'): DIRS += ['linux'] else: DIRS += ['windows'] + +FINAL_TARGET_FILES.extensions['{972ce4c6-7e08-4474-a285-3208198ce6fd}'] += ['shared/icon.png'] diff --git a/browser/themes/osx/Makefile.in b/browser/themes/osx/Makefile.in deleted file mode 100644 index bf6869d2c09a..000000000000 --- a/browser/themes/osx/Makefile.in +++ /dev/null @@ -1,7 +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/. - -ICON_FILES := ../shared/icon.png -ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -INSTALL_TARGETS += ICON diff --git a/browser/themes/windows/Makefile.in b/browser/themes/windows/Makefile.in deleted file mode 100644 index bf6869d2c09a..000000000000 --- a/browser/themes/windows/Makefile.in +++ /dev/null @@ -1,7 +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/. - -ICON_FILES := ../shared/icon.png -ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -INSTALL_TARGETS += ICON