From 0a22a9fc3d0fe38be02b60aff5535fa89dc13d67 Mon Sep 17 00:00:00 2001 From: "bugzilla%standard8.demon.co.uk" Date: Wed, 4 Apr 2007 08:38:46 +0000 Subject: [PATCH] Bug 376344 Simplify inclusion of platformMailnewsOverlay.xul in messenger.jar. r=Neil,sr=mscott git-svn-id: svn://10.0.0.236/trunk@224138 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/base/resources/Makefile.in | 48 ---------------- .../base/resources/content/Makefile.in | 56 ------------------- .../base/resources/content/mac/Makefile.in | 48 ---------------- .../base/resources/content/mac/jar.mn | 2 - .../base/resources/content/unix/Makefile.in | 47 ---------------- .../base/resources/content/unix/jar.mn | 2 - .../base/resources/content/win/Makefile.in | 47 ---------------- .../base/resources/content/win/jar.mn | 2 - 8 files changed, 252 deletions(-) delete mode 100644 mozilla/mailnews/base/resources/Makefile.in delete mode 100644 mozilla/mailnews/base/resources/content/Makefile.in delete mode 100644 mozilla/mailnews/base/resources/content/mac/Makefile.in delete mode 100644 mozilla/mailnews/base/resources/content/mac/jar.mn delete mode 100644 mozilla/mailnews/base/resources/content/unix/Makefile.in delete mode 100644 mozilla/mailnews/base/resources/content/unix/jar.mn delete mode 100644 mozilla/mailnews/base/resources/content/win/Makefile.in delete mode 100644 mozilla/mailnews/base/resources/content/win/jar.mn diff --git a/mozilla/mailnews/base/resources/Makefile.in b/mozilla/mailnews/base/resources/Makefile.in deleted file mode 100644 index abd592559ea..00000000000 --- a/mozilla/mailnews/base/resources/Makefile.in +++ /dev/null @@ -1,48 +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 - -DIRS = content - -include $(topsrcdir)/config/rules.mk - diff --git a/mozilla/mailnews/base/resources/content/Makefile.in b/mozilla/mailnews/base/resources/content/Makefile.in deleted file mode 100644 index 1903b24afa9..00000000000 --- a/mozilla/mailnews/base/resources/content/Makefile.in +++ /dev/null @@ -1,56 +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 WINNT,$(OS_ARCH))) -DIRS = win -else -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -DIRS = mac -else -DIRS = unix -endif -endif - -include $(topsrcdir)/config/rules.mk - diff --git a/mozilla/mailnews/base/resources/content/mac/Makefile.in b/mozilla/mailnews/base/resources/content/mac/Makefile.in deleted file mode 100644 index 1cee75708f4..00000000000 --- a/mozilla/mailnews/base/resources/content/mac/Makefile.in +++ /dev/null @@ -1,48 +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) 2003 -# 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 ***** - -# Placeholder to process buried jar.mn - -DEPTH = ../../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - - -include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/resources/content/mac/jar.mn b/mozilla/mailnews/base/resources/content/mac/jar.mn deleted file mode 100644 index 1dec9e86282..00000000000 --- a/mozilla/mailnews/base/resources/content/mac/jar.mn +++ /dev/null @@ -1,2 +0,0 @@ -messenger.jar: - content/messenger/platformMailnewsOverlay.xul diff --git a/mozilla/mailnews/base/resources/content/unix/Makefile.in b/mozilla/mailnews/base/resources/content/unix/Makefile.in deleted file mode 100644 index ada6d6bd4f9..00000000000 --- a/mozilla/mailnews/base/resources/content/unix/Makefile.in +++ /dev/null @@ -1,47 +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) 2000 -# 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 - - diff --git a/mozilla/mailnews/base/resources/content/unix/jar.mn b/mozilla/mailnews/base/resources/content/unix/jar.mn deleted file mode 100644 index 1dec9e86282..00000000000 --- a/mozilla/mailnews/base/resources/content/unix/jar.mn +++ /dev/null @@ -1,2 +0,0 @@ -messenger.jar: - content/messenger/platformMailnewsOverlay.xul diff --git a/mozilla/mailnews/base/resources/content/win/Makefile.in b/mozilla/mailnews/base/resources/content/win/Makefile.in deleted file mode 100644 index bfe65664595..00000000000 --- a/mozilla/mailnews/base/resources/content/win/Makefile.in +++ /dev/null @@ -1,47 +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 -# IBM Corporation. -# Portions created by the Initial Developer are Copyright (C) 2004 -# 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 - - diff --git a/mozilla/mailnews/base/resources/content/win/jar.mn b/mozilla/mailnews/base/resources/content/win/jar.mn deleted file mode 100644 index 1dec9e86282..00000000000 --- a/mozilla/mailnews/base/resources/content/win/jar.mn +++ /dev/null @@ -1,2 +0,0 @@ -messenger.jar: - content/messenger/platformMailnewsOverlay.xul