Bug 504645 - Remove document.png from the source tree since it is no longer needed; r=dolske+mfinkle

This commit is contained in:
Jared Wein 2011-06-26 18:27:59 +02:00
parent 4041dc2544
commit 282a45f969
11 changed files with 6 additions and 21 deletions

View File

@ -23,6 +23,7 @@
# Jonathan Wilson <jonwil@tpgi.com.au>
# Dan Mosedale <dmose@mozilla.org>
# Benjamin Smedberg <benjamin@smedbergs.us>
# Jared Wein <jwein@mozilla.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -199,7 +200,6 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs::
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default

View File

@ -19,6 +19,7 @@
#
# Contributor(s):
# Justin Dolske <dolske@mozilla.com> (original author)
# Jared Wein <jwein@mozilla.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -75,7 +76,6 @@ LINUX_BRANDING_FILES = \
default16.png \
default32.png \
default48.png \
document.png \
mozicon128.png \
$(NULL)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -19,6 +19,7 @@
#
# Contributor(s):
# Justin Dolske <dolske@mozilla.com> (original author)
# Jared Wein <jwein@mozilla.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -75,7 +76,6 @@ LINUX_BRANDING_FILES = \
default16.png \
default32.png \
default48.png \
document.png \
mozicon128.png \
$(NULL)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -19,6 +19,7 @@
#
# Contributor(s):
# Justin Dolske <dolske@mozilla.com> (original author)
# Jared Wein <jwein@mozilla.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -75,7 +76,6 @@ LINUX_BRANDING_FILES = \
default16.png \
default32.png \
default48.png \
document.png \
mozicon128.png \
$(NULL)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -19,6 +19,7 @@
#
# Contributor(s):
# Justin Dolske <dolske@mozilla.com> (original author)
# Jared Wein <jwein@mozilla.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -75,7 +76,6 @@ LINUX_BRANDING_FILES = \
default16.png \
default32.png \
default48.png \
document.png \
mozicon128.png \
$(NULL)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -25,6 +25,7 @@
# Dan Mosedale <dmose@mozilla.org>
# Darin Fisher <darin@meer.net>
# Benjamin Smedberg <benjamin@smedbergs.us>
# Jared Wein <jwein@mozilla.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -178,19 +179,6 @@ GARBAGE += xulrunner
endif
endif
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
ICON_FILES = \
$(DIST)/branding/document.png \
$(NULL)
libs:: $(ICON_FILES)
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons
install::
$(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs::
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
@ -209,9 +197,6 @@ ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/xulrunner.ico $(DIST)/branding/app.ico
cp $(srcdir)/document.ico $(DIST)/branding/document.ico
endif
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
cp $(srcdir)/document.png $(DIST)/branding/document.png
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(srcdir)/default16.png $(DIST)/branding/default16.png
cp $(srcdir)/default32.png $(DIST)/branding/default32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB