From d372d25e42355e3bbc546d98cedef5a2681faaaa Mon Sep 17 00:00:00 2001 From: "neil%parkwaycc.co.uk" Date: Wed, 18 Aug 2004 19:14:51 +0000 Subject: [PATCH] Bug 255268 Make make chrome make installed-chrome.txt correctly r=bsmedberg --- .../pref/autoconfig/resources/Makefile.in | 2 +- mailnews/extensions/mailviews/Makefile.in | 2 +- mailnews/extensions/mdn/Makefile.in | 2 + xpfe/browser/Makefile.in | 2 +- xpfe/communicator/Makefile.in | 2 +- .../resources/content/Makefile.in | 63 ------------------- .../resources/locale/en-US/Makefile.in | 54 ---------------- xpfe/global/Makefile.in | 2 +- xpfe/global/resources/content/Makefile.in | 2 +- 9 files changed, 8 insertions(+), 123 deletions(-) diff --git a/extensions/pref/autoconfig/resources/Makefile.in b/extensions/pref/autoconfig/resources/Makefile.in index 024b9078c1f..650cba6381a 100644 --- a/extensions/pref/autoconfig/resources/Makefile.in +++ b/extensions/pref/autoconfig/resources/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -libs:: +libs realchrome:: @$(REGCHROME) content autoconfig comm.jar @$(REGCHROME) locale en-US/autoconfig en-US.jar diff --git a/mailnews/extensions/mailviews/Makefile.in b/mailnews/extensions/mailviews/Makefile.in index 4091f0c2044..298caa6c796 100644 --- a/mailnews/extensions/mailviews/Makefile.in +++ b/mailnews/extensions/mailviews/Makefile.in @@ -55,7 +55,7 @@ endif include $(topsrcdir)/config/rules.mk -libs:: +libs realchrome:: @$(REGCHROME) content messenger-views messenger.jar install:: diff --git a/mailnews/extensions/mdn/Makefile.in b/mailnews/extensions/mdn/Makefile.in index 47be60a2a2d..9b3fbd9b7c4 100644 --- a/mailnews/extensions/mdn/Makefile.in +++ b/mailnews/extensions/mdn/Makefile.in @@ -56,6 +56,8 @@ include $(topsrcdir)/config/rules.mk libs:: $(INSTALL) $(srcdir)/resources/content/mdn.js $(DIST)/bin/defaults/pref + +libs realchrome:: @$(REGCHROME) content messenger-mdn messenger.jar @$(REGCHROME) locale en-US/messenger-mdn en-US.jar diff --git a/xpfe/browser/Makefile.in b/xpfe/browser/Makefile.in index e14e00c2a7c..f91b11b6984 100644 --- a/xpfe/browser/Makefile.in +++ b/xpfe/browser/Makefile.in @@ -58,7 +58,7 @@ CHROME_PLATFORM = unix endif endif -libs:: +libs realchrome:: @$(REGCHROME) locale en-US/navigator-platform en-$(CHROME_PLATFORM).jar install:: diff --git a/xpfe/communicator/Makefile.in b/xpfe/communicator/Makefile.in index dcc3dfb6c2e..989b2c72a78 100644 --- a/xpfe/communicator/Makefile.in +++ b/xpfe/communicator/Makefile.in @@ -56,7 +56,7 @@ CHROME_PLATFORM = unix endif endif -libs:: +libs realchrome:: @$(REGCHROME) locale en-US/communicator-platform en-$(CHROME_PLATFORM).jar install:: diff --git a/xpfe/communicator/resources/content/Makefile.in b/xpfe/communicator/resources/content/Makefile.in index 75cca23fc3a..e69de29bb2d 100644 --- a/xpfe/communicator/resources/content/Makefile.in +++ b/xpfe/communicator/resources/content/Makefile.in @@ -1,63 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either of the GNU General Public License Version 2 or later (the "GPL"), -# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -ifneq (,$(filter os2 windows,$(MOZ_WIDGET_TOOLKIT))) -DIRS = win -else -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -DIRS = mac -else -DIRS = unix -endif -endif - -include $(topsrcdir)/config/rules.mk - -libs:: - @$(REGCHROME) content communicator comm.jar - @$(REGCHROME) locale en-US/communicator en-US.jar - -install:: - @$(REGCHROME_INSTALL) content communicator comm.jar - @$(REGCHROME_INSTALL) locale en-US/communicator en-US.jar diff --git a/xpfe/communicator/resources/locale/en-US/Makefile.in b/xpfe/communicator/resources/locale/en-US/Makefile.in index 15a890d8c00..e69de29bb2d 100644 --- a/xpfe/communicator/resources/locale/en-US/Makefile.in +++ b/xpfe/communicator/resources/locale/en-US/Makefile.in @@ -1,54 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either of the GNU General Public License Version 2 or later (the "GPL"), -# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - -libs:: - @$(REGCHROME) content communicator comm.jar - @$(REGCHROME) locale en-US/communicator en-US.jar - -install:: - @$(REGCHROME_INSTALL) content communicator comm.jar - @$(REGCHROME_INSTALL) locale en-US/communicator en-US.jar - diff --git a/xpfe/global/Makefile.in b/xpfe/global/Makefile.in index e3d68fbfe33..1f420ebc6a4 100644 --- a/xpfe/global/Makefile.in +++ b/xpfe/global/Makefile.in @@ -64,7 +64,7 @@ build.dtd: build.dtd.in $(DEPTH)/config/build_number @$(RM) -f $@ $(PERL) -I$(topsrcdir)/config $(topsrcdir)/config/aboutime.pl $@ $(DEPTH)/config/build_number $(srcdir)/build.dtd.in -libs:: +libs realchrome:: @$(REGCHROME) locale en-US/global-platform en-$(CHROME_PLATFORM).jar install:: diff --git a/xpfe/global/resources/content/Makefile.in b/xpfe/global/resources/content/Makefile.in index c37199854bf..b5c69ad043e 100644 --- a/xpfe/global/resources/content/Makefile.in +++ b/xpfe/global/resources/content/Makefile.in @@ -54,7 +54,7 @@ endif include $(topsrcdir)/config/rules.mk -libs:: +libs realchrome:: @$(REGCHROME) content global toolkit.jar @$(REGCHROME) locale en-US/global en-US.jar