From e0ba6391f20b854171e230e15f44e58da7d499a2 Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Tue, 19 Sep 2000 03:58:15 +0000 Subject: [PATCH] Chrome jar reorg for unix. git-svn-id: svn://10.0.0.236/branches/jar_restructuring_branch@79512 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/config.mk | 2 + mozilla/config/make-jars.pl | 4 +- mozilla/config/rules.mak | 1 - mozilla/config/rules.mk | 97 +----- mozilla/docshell/base/Makefile.in | 3 - mozilla/editor/Makefile.in | 3 + mozilla/embedding/browser/chrome/Makefile.in | 5 + .../embedding/browser/chrome/skin/Makefile.in | 19 -- mozilla/extensions/cview/Makefile.in | 2 - .../extensions/cview/resources/Makefile.in | 11 - mozilla/extensions/irc/Makefile.in | 92 +----- mozilla/extensions/irc/xul/Makefile.in | 5 + .../extensions/irc/xul/content/Makefile.in | 16 - .../irc/xul/locale/en-US/Makefile.in | 15 - .../wallet/cookieviewer/Makefile.in | 5 - .../resources/content/Makefile.in | 9 - .../resources/locale/en-US/Makefile.in | 8 - mozilla/extensions/wallet/editor/Makefile.in | 9 - .../editor/resources/content/Makefile.in | 9 - .../editor/resources/locale/en-US/Makefile.in | 9 - .../wallet/signonviewer/Makefile.in | 4 - .../resources/content/Makefile.in | 3 - .../resources/locale/en-US/Makefile.in | 3 - mozilla/extensions/wallet/src/Makefile.in | 6 - .../src/resources/locale/en-US/Makefile.in | 7 - .../wallet/walletpreview/Makefile.in | 4 - .../resources/content/Makefile.in | 4 - .../resources/locale/en-US/Makefile.in | 3 - mozilla/intl/uconv/src/Makefile.in | 7 +- mozilla/mailnews/Makefile.in | 3 + .../absync/resources/locale/en-US/Makefile.in | 6 - .../prefs/resources/content/Makefile.in | 13 - .../prefs/resources/locale/en-US/Makefile.in | 3 - .../addrbook/resources/content/Makefile.in | 31 -- .../resources/locale/en-US/Makefile.in | 16 - mozilla/mailnews/base/ispdata/Makefile.in | 13 - .../base/resources/content/unix/Makefile.in | 6 - .../imap/resources/locale/en-US/Makefile.in | 3 - .../local/resources/locale/en-US/Makefile.in | 2 - .../mime/abstatus/resources/skin/Makefile.in | 3 - .../mime/cthandlers/resources/Makefile.in | 3 - mozilla/mailnews/mime/resources/Makefile.in | 5 - mozilla/modules/libjar/nsJAR.cpp | 2 +- mozilla/netwerk/resources/Makefile.in | 3 + mozilla/netwerk/resources/content/Makefile.in | 12 - .../resources/locale/en-US/Makefile.in | 7 - .../resources/content/Makefile.in | 9 - .../resources/locale/en-US/Makefile.in | 8 - mozilla/profile/resources/content/Makefile.in | 22 -- .../resources/locale/en-US/Makefile.in | 19 -- mozilla/security/base/res/content/Makefile.in | 10 - .../base/res/locale/en-US/Makefile.in | 11 - mozilla/themes/blue/Makefile.in | 15 +- mozilla/themes/blue/communicator/Makefile.in | 30 -- .../blue/communicator/bookmarks/Makefile.in | 25 -- .../blue/communicator/directory/Makefile.in | 19 -- .../blue/communicator/profile/Makefile.in | 17 - .../blue/communicator/regviewer/Makefile.in | 13 - .../blue/communicator/related/Makefile.in | 14 - .../blue/communicator/search/Makefile.in | 20 -- .../blue/communicator/sidebar/Makefile.in | 35 --- .../blue/communicator/xpinstall/Makefile.in | 13 - mozilla/themes/blue/editor/Makefile.in | 16 - mozilla/themes/blue/editor/images/Makefile.in | 84 ----- mozilla/themes/blue/global/Makefile.in | 146 --------- mozilla/themes/blue/messenger/Makefile.in | 112 ------- .../blue/messenger/addressbook/Makefile.in | 22 -- .../messenger/messengercompose/Makefile.in | 23 -- mozilla/themes/blue/navigator/Makefile.in | 29 -- mozilla/themes/classic/Makefile.in | 15 +- .../themes/classic/communicator/Makefile.in | 22 -- .../communicator/bookmarks/Makefile.in | 26 -- .../communicator/directory/Makefile.in | 19 -- .../classic/communicator/profile/Makefile.in | 13 - .../communicator/regviewer/Makefile.in | 12 - .../classic/communicator/related/Makefile.in | 14 - .../classic/communicator/search/Makefile.in | 13 - .../communicator/search/win/Makefile.in | 18 -- .../classic/communicator/sidebar/Makefile.in | 16 - .../communicator/sidebar/unix/Makefile.in | 15 - .../communicator/sidebar/win/Makefile.in | 16 - .../classic/communicator/unix/Makefile.in | 16 - .../classic/communicator/win/Makefile.in | 18 -- .../communicator/xpinstall/Makefile.in | 13 - mozilla/themes/classic/editor/Makefile.in | 16 - .../themes/classic/editor/images/Makefile.in | 161 ---------- mozilla/themes/classic/editor/win/Makefile.in | 13 - mozilla/themes/classic/global/Makefile.in | 117 ------- .../themes/classic/global/unix/Makefile.in | 40 --- mozilla/themes/classic/global/win/Makefile.in | 42 --- mozilla/themes/classic/makefile.win | 3 - mozilla/themes/classic/messenger/Makefile.in | 133 -------- .../classic/messenger/addressbook/Makefile.in | 45 --- .../messenger/addressbook/win/Makefile.in | 14 - .../classic/messenger/addressbook/win/jar.mn | 4 +- .../messenger/messengercompose/Makefile.in | 50 --- .../themes/classic/messenger/win/Makefile.in | 18 -- mozilla/themes/classic/messenger/win/jar.mn | 14 +- mozilla/themes/classic/navigator/Makefile.in | 29 -- mozilla/themes/classic/navigator/mac/jar.mn | 2 +- .../themes/classic/navigator/unix/Makefile.in | 14 - .../themes/classic/navigator/win/Makefile.in | 14 - mozilla/themes/modern/Makefile.in | 18 +- .../themes/modern/communicator/Makefile.in | 38 --- .../modern/communicator/bookmarks/Makefile.in | 29 -- .../modern/communicator/directory/Makefile.in | 19 -- .../modern/communicator/profile/Makefile.in | 17 - .../modern/communicator/regviewer/Makefile.in | 12 - .../modern/communicator/related/Makefile.in | 13 - .../modern/communicator/search/Makefile.in | 20 -- .../modern/communicator/sidebar/Makefile.in | 41 --- .../modern/communicator/xpinstall/Makefile.in | 13 - mozilla/themes/modern/editor/Makefile.in | 16 - .../themes/modern/editor/images/Makefile.in | 146 --------- mozilla/themes/modern/global/Makefile.in | 290 ------------------ mozilla/themes/modern/makefile.win | 4 - mozilla/themes/modern/messenger/Makefile.in | 136 -------- .../modern/messenger/addressbook/Makefile.in | 34 -- .../messenger/messengercompose/Makefile.in | 41 --- mozilla/themes/modern/navigator/Makefile.in | 48 --- mozilla/xpcom/base/Makefile.in | 8 - mozilla/xpfe/browser/Makefile.in | 3 + .../resources/locale/en-US/Makefile.in | 33 +- mozilla/xpfe/communicator/Makefile.in | 3 + .../resources/content/Makefile.in | 27 +- .../resources/content/makefile.win | 23 -- .../resources/locale/en-US/Makefile.in | 21 +- .../resources/locale/en-US/makefile.win | 17 - .../resources/content/Makefile.in | 6 - mozilla/xpfe/global/Makefile.in | 3 + .../xpfe/global/resources/content/Makefile.in | 57 +--- .../global/resources/content/makefile.win | 53 ---- mozilla/xpinstall/packager/packages-unix | 32 +- mozilla/xpinstall/packager/unix/browser.jst | 24 +- mozilla/xpinstall/packager/unix/chatzilla.jst | 11 +- mozilla/xpinstall/packager/unix/langende.jst | 2 +- mozilla/xpinstall/packager/unix/langengb.jst | 2 +- mozilla/xpinstall/packager/unix/langenus.jst | 8 +- mozilla/xpinstall/packager/unix/mail.jst | 3 +- .../xpinstall/packager/windows/langende.jst | 2 +- .../xpinstall/packager/windows/langengb.jst | 2 +- 141 files changed, 137 insertions(+), 3321 deletions(-) diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index 6f8cff49713..8466f0b3fde 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -51,6 +51,8 @@ BUILD_TOOLS = $(topsrcdir)/build/unix CONFIG_TOOLS = $(DEPTH)/config AUTOCONF_TOOLS = $(topsrcdir)/build/autoconf +PERL = perl + # # Tweak the default OS_ARCH and OS_RELEASE macros as needed. # diff --git a/mozilla/config/make-jars.pl b/mozilla/config/make-jars.pl index 24c38818433..c60dc190435 100644 --- a/mozilla/config/make-jars.pl +++ b/mozilla/config/make-jars.pl @@ -200,14 +200,14 @@ sub EnsureFileInDir return 0; } -while (<>) { +while () { chomp; start: if (/^([\w\d.\-\\\/]+)\:\s*$/) { my $jarfile = $1; my $args = ""; my $overrides = ""; - while (<>) { + while () { if (/^\s+([\w\d.\-\\\/]+)\s*(\([\w\d.\-\\\/]+\))?$\s*/) { my $dest = $1; my $srcPath = $2; diff --git a/mozilla/config/rules.mak b/mozilla/config/rules.mak index 43b68f62e5f..7a8bb37a80b 100644 --- a/mozilla/config/rules.mak +++ b/mozilla/config/rules.mak @@ -598,7 +598,6 @@ chrome:: $(PERL) $(DEPTH)\config\make-jars.pl -c -d $(DIST)\bin\chrome < $(JAR_MANIFEST) !endif -# add to chrome:: rule: REGCHROME = @perl $(DEPTH)\config\add-chrome.pl $(DIST)\bin\chrome\installed-chrome.txt regchrome: diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index ff0a31b01db..2e8f409546f 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/config/rules.mk @@ -1126,102 +1126,17 @@ GARBAGE_DIRS += $(XPIDL_GEN_DIR) endif ################################################################################ -# Generate chrome building rules. -# -# You need to set these in your makefile.win to utilize this support: -# CHROME_DIR - specifies the chrome subdirectory where your chrome files -# go; e.g., CHROME_DIR=navigator or CHROME_DIR=global -# -# Note: All file listed in the next three macros MUST be prefaced with .\ (or ./)! -# -# CHROME_CONTENT - list of chrome content files; these can be prefaced with -# arbitrary paths; e.g., CHROME_CONTENT=./content/default/foobar.xul -# CHROME_SKIN - list of skin files -# CHROME_L10N - list of localization files, e.g., CHROME_L10N=./locale/en-US/foobar.dtd -# -# These macros are optional, if not specified, each defaults to ".". -# CHROME_CONTENT_DIR - specifies a subdirectory within CHROME_DIR where -# all CHROME_CONTENT files will be installed. -# CHROME_SKIN_DIR - Like above, but for skin files -# CHROME_L10N_DIR - Like above, but for localization files -# CHROME_TYPE - The type of chrome being generated (content, skin, locale). -# Top-level makefiles (the same one copying the rdf manifests -# and generating the jar file) should define this macro. -# This will notify the chrome registry of a new installation. -ifneq ($(MOZ_ENABLE_JAR_PACKAGING),) +# CHROME PACKAGING -JAR_MANIFEST := $(srcdir)/jar.mn -install:: - @if test -f $(JAR_MANIFEST); then $(PERL) $(topsrcdir)/config/make-jars-unix.pl -d $(DIST)/bin/chrome -s $(srcdir) < $(JAR_MANIFEST); fi +JAR_MANIFEST := jar.mn -ifneq ($(CHROME_TYPE),) -install:: $(addprefix bogus/, $(CHROME_TYPE)) +chrome:: + @if test -f $(JAR_MANIFEST); then $(PERL) $(topsrcdir)/config/make-jars.pl -c -d $(DIST)/bin/chrome < $(JAR_MANIFEST); fi -$(addprefix bogus/, $(CHROME_TYPE)): - @echo $(patsubst bogus/%, %, $@),install,url,jar:resource:/chrome/$(CHROME_DIR).jar!/ >>$(DEPTH)/dist/bin/chrome/installed-chrome.txt -endif #CHROME_TYPE +install:: chrome -# keeping this in so that bad install rules will work. -ifneq ($(CHROME_DIR),) -CHROME_DIST := $(DIST)/bin/chrome/$(CHROME_DIR) -endif +REGCHROME = $(PERL) $(DEPTH)/config/add-chrome.pl $(DIST)/bin/chrome/installed-chrome.txt -else # MOZ_DISBALE_JAR_PACKAGING - -ifneq ($(CHROME_DIR),) -CHROME_DIST := $(DIST)/bin/chrome/$(CHROME_DIR) - -# Content -ifneq ($(CHROME_CONTENT),) -ifeq ($(CHROME_CONTENT_DIR),) # Use CHROME_DIR unless specified otherwise. -CHROME_CONTENT_DIR := . -endif -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(CHROME_CONTENT)) $(CHROME_DIST)/$(CHROME_CONTENT_DIR) -endif -# content - -# Skin -ifneq ($(CHROME_SKIN),) -ifeq ($(CHROME_SKIN_DIR),) # Use CHROME_DIR unless specified otherwise. -CHROME_SKIN_DIR := . -endif -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(CHROME_SKIN)) $(CHROME_DIST)/$(CHROME_SKIN_DIR) -endif -# skin - -# Localization. -ifneq ($(CHROME_L10N),) -ifeq ($(CHROME_L10N_DIR),) # Use CHROME_DIR unless specified otherwise. -CHROME_L10N_DIR := . -endif -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(CHROME_L10N)) $(CHROME_DIST)/$(CHROME_L10N_DIR) -endif -# localization - -# misc -ifneq ($(CHROME_MISC),) -ifeq ($(CHROME_MISC_DIR),) # Use CHROME_DIR unless specified otherwise. -CHROME_MISC_DIR := . -endif -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(CHROME_MISC)) $(CHROME_DIST)/$(CHROME_MISC_DIR) -endif -# misc - -ifneq ($(CHROME_TYPE),) -install:: $(addprefix bogus/, $(CHROME_TYPE)) - -$(addprefix bogus/, $(CHROME_TYPE)): - @echo $(patsubst bogus/%, %, $@),install,url,resource:/chrome/$(CHROME_DIR)/ >>$(DEPTH)/dist/bin/chrome/installed-chrome.txt -endif - -endif #chrome - -endif # MOZ_DISABLE_JAR_PACKAGING -# chrome ############################################################################## ifndef NO_MDUPDATE diff --git a/mozilla/docshell/base/Makefile.in b/mozilla/docshell/base/Makefile.in index 436f40e87bf..f8edfd85592 100644 --- a/mozilla/docshell/base/Makefile.in +++ b/mozilla/docshell/base/Makefile.in @@ -57,6 +57,3 @@ override NO_SHARED_LIB=1 override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(srcdir)/appstrings.properties $(DIST)/bin/chrome/locales/en-US/global/locale diff --git a/mozilla/editor/Makefile.in b/mozilla/editor/Makefile.in index eb69813f19c..05da8e38190 100644 --- a/mozilla/editor/Makefile.in +++ b/mozilla/editor/Makefile.in @@ -30,3 +30,6 @@ DIRS = public idl base ui txmgr txtsvc include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) content editor comm.jar; \ + $(REGCHROME) locale en-US/editor en-US.jar diff --git a/mozilla/embedding/browser/chrome/Makefile.in b/mozilla/embedding/browser/chrome/Makefile.in index ee1b1534b35..2e991a9c431 100644 --- a/mozilla/embedding/browser/chrome/Makefile.in +++ b/mozilla/embedding/browser/chrome/Makefile.in @@ -39,3 +39,8 @@ CHROME_MISC = \ $(NULL) include $(topsrcdir)/config/rules.mk + +chrome:: + @$(REGCHROME) content browser embed.jar; \ + $(REGCHROME) skin modern/browser embed.jar; \ + $(REGCHROME) locale en-US/browser embed.jar diff --git a/mozilla/embedding/browser/chrome/skin/Makefile.in b/mozilla/embedding/browser/chrome/skin/Makefile.in index 67da0ee7f3e..1271b052904 100644 --- a/mozilla/embedding/browser/chrome/skin/Makefile.in +++ b/mozilla/embedding/browser/chrome/skin/Makefile.in @@ -25,23 +25,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CHROME_DIR = packages/embedding -CHROME_CONTENT_DIR = browser/content - -CHROME_CONTENT = \ - $(NULL) - -SKINFILES = \ - $(srcdir)/simple-shell.css \ - $(srcdir)/embedding.css \ - $(srcdir)/back.gif \ - $(srcdir)/forward.gif \ - $(srcdir)/reload.gif \ - $(srcdir)/stop.gif - include $(topsrcdir)/config/rules.mk - -INSTALLROOT = $(DIST)/bin/chrome/packages/embedding/browser - -install:: - $(INSTALL) $(SKINFILES) $(INSTALLROOT)/skin \ No newline at end of file diff --git a/mozilla/extensions/cview/Makefile.in b/mozilla/extensions/cview/Makefile.in index 08d5ce5321b..8e1d33857b1 100644 --- a/mozilla/extensions/cview/Makefile.in +++ b/mozilla/extensions/cview/Makefile.in @@ -30,7 +30,5 @@ include $(DEPTH)/config/autoconf.mk DIRS = resources -INSTALLROOT = $(DIST)/bin/chrome/packages/cview/cview - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/cview/resources/Makefile.in b/mozilla/extensions/cview/resources/Makefile.in index 0082754e30f..bc13ddf5ff2 100644 --- a/mozilla/extensions/cview/resources/Makefile.in +++ b/mozilla/extensions/cview/resources/Makefile.in @@ -30,15 +30,4 @@ include $(DEPTH)/config/autoconf.mk DIRS = content locale skin -CHROME_DIR = packages/cview -CHROME_MISC_DIR = . - -# this is the magic variable that causes the various parts of the -# chrome registration information to get created. -CHROME_TYPE = content locale skin - -CHROME_MISC = \ - manifest.rdf \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/irc/Makefile.in b/mozilla/extensions/irc/Makefile.in index e54b1b51057..73f5610f50d 100644 --- a/mozilla/extensions/irc/Makefile.in +++ b/mozilla/extensions/irc/Makefile.in @@ -36,97 +36,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = xul -JSLIBFILES = \ - $(srcdir)/js/lib/utils.js \ - $(srcdir)/js/lib/events.js \ - $(srcdir)/js/lib/connection-xpcom.js \ - $(srcdir)/js/lib/command-manager.js \ - $(srcdir)/js/lib/irc.js \ - $(srcdir)/js/lib/irc-debug.js \ - $(NULL) - -XULLIBFILES = \ - $(srcdir)/xul/lib/listbox.js \ - $(srcdir)/xul/lib/munger.js \ - $(NULL) - -CONTENTFILES = \ - $(srcdir)/xul/content/chatzilla.xul \ - $(srcdir)/xul/content/commands.js \ - $(srcdir)/xul/content/handlers.js \ - $(srcdir)/xul/content/readprefs.js \ - $(srcdir)/xul/content/static.js \ - $(srcdir)/xul/content/rdf.js \ - $(NULL) - -SKINFILES = \ - $(srcdir)/xul/skin/chatzilla.css \ - $(srcdir)/xul/skin/output-default.css \ - $(srcdir)/xul/skin/output-loud.css \ - $(srcdir)/xul/skin/output-marble.css \ - $(NULL) - -IMAGEFILES = \ - $(srcdir)/xul/skin/images/xtal.jpg \ - $(srcdir)/xul/skin/images/blue_rock.gif \ - $(srcdir)/xul/skin/images/face-frown.gif \ - $(srcdir)/xul/skin/images/face-tongue.gif \ - $(srcdir)/xul/skin/images/face-angry.gif \ - $(srcdir)/xul/skin/images/face-screw.gif \ - $(srcdir)/xul/skin/images/face-wink.gif \ - $(srcdir)/xul/skin/images/face-cry.gif \ - $(srcdir)/xul/skin/images/face-smile.gif \ - $(srcdir)/xul/skin/images/face-dunno.gif \ - $(srcdir)/xul/skin/images/face-surprise.gif \ - $(srcdir)/xul/skin/images/is-op.gif \ - $(srcdir)/xul/skin/images/isnt-op.gif \ - $(srcdir)/xul/skin/images/is-voice.gif \ - $(srcdir)/xul/skin/images/isnt-voice.gif \ - $(srcdir)/xul/skin/images/view-activity.gif \ - $(srcdir)/xul/skin/images/view-attention.gif \ - $(srcdir)/xul/skin/images/view-current.gif \ - $(srcdir)/xul/skin/images/view-normal.gif \ - $(NULL) - -TESTFILES = \ - $(srcdir)/xul/tests/test3.xul \ - $(srcdir)/xul/tests/test3.css \ - $(srcdir)/xul/tests/test3-output-default.css \ - $(srcdir)/xul/tests/test3-output-marble.css \ - $(srcdir)/xul/tests/test3-output-loud.css \ - $(srcdir)/xul/tests/test3-static.js \ - $(srcdir)/xul/tests/test3-handlers.js \ - $(srcdir)/xul/tests/test3-commands.js \ - $(srcdir)/xul/tests/test3-readprefs.js \ - $(srcdir)/xul/tests/g_green.gif \ - $(srcdir)/xul/tests/g_green_on.gif \ - $(srcdir)/xul/tests/g_grey.gif \ - $(srcdir)/xul/tests/g_grey_on.gif \ - $(srcdir)/xul/tests/green-on.gif \ - $(srcdir)/xul/tests/green-off.gif \ - $(srcdir)/xul/tests/green-blink-1.gif \ - $(srcdir)/xul/tests/yellow-on.gif \ - $(srcdir)/xul/tests/xtal.jpg \ - $(srcdir)/xul/tests/blue_rock.gif \ - $(srcdir)/xul/tests/face-angry.gif \ - $(srcdir)/xul/tests/face-cry.gif \ - $(srcdir)/xul/tests/face-frown.gif \ - $(srcdir)/xul/tests/face-smile.gif \ - $(srcdir)/xul/tests/face-surprise.gif \ - $(srcdir)/xul/tests/face-tongue.gif \ - $(srcdir)/xul/tests/face-wink.gif \ - $(srcdir)/xul/tests/face-screw.gif \ - $(srcdir)/xul/tests/face-dunno.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk -INSTALLROOT = $(DIST)/bin/chrome/packages/chatzilla/chatzilla - install:: - $(INSTALL) $(JSLIBFILES) $(INSTALLROOT)/content/lib/js - $(INSTALL) $(XULLIBFILES) $(INSTALLROOT)/content/lib/xul - $(INSTALL) $(CONTENTFILES) $(INSTALLROOT)/content - $(INSTALL) $(SKINFILES) $(INSTALLROOT)/skin - $(INSTALL) $(IMAGEFILES) $(INSTALLROOT)/skin/images - $(INSTALL) $(srcdir)/js/lib/chatzilla-service.js $(DIST)/bin/components + $(INSTALL) ./js/lib/chatzilla-service.js $(DIST)/bin/components diff --git a/mozilla/extensions/irc/xul/Makefile.in b/mozilla/extensions/irc/xul/Makefile.in index 96eefd927f3..012476704be 100644 --- a/mozilla/extensions/irc/xul/Makefile.in +++ b/mozilla/extensions/irc/xul/Makefile.in @@ -38,3 +38,8 @@ CHROME_MISC = \ include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) content chatzilla chatzilla.jar; \ + $(REGCHROME) skin modern/chatzilla chatzilla.jar; \ + $(REGCHROME) locale en-US/chatzilla chatzilla.jar; \ + $(REGCHROME) content communicator comm.jar diff --git a/mozilla/extensions/irc/xul/content/Makefile.in b/mozilla/extensions/irc/xul/content/Makefile.in index b3e902ba88c..e1d403b23f6 100644 --- a/mozilla/extensions/irc/xul/content/Makefile.in +++ b/mozilla/extensions/irc/xul/content/Makefile.in @@ -25,20 +25,4 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -CHROME_DIR=packages/chatzilla -CHROME_CONTENT_DIR=chatzilla/content - -CHROME_CONTENT = \ - chatzillaOverlay.xul \ - chatzillaOverlay.js \ - $(NULL) - -EXPORT_PREF_CONTENT = \ - $(srcdir)/pref-irc.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(EXPORT_PREF_CONTENT) $(DIST)/bin/chrome/packages/core/communicator/content/pref diff --git a/mozilla/extensions/irc/xul/locale/en-US/Makefile.in b/mozilla/extensions/irc/xul/locale/en-US/Makefile.in index aa41f1a0f60..b1876dc5e2e 100644 --- a/mozilla/extensions/irc/xul/locale/en-US/Makefile.in +++ b/mozilla/extensions/irc/xul/locale/en-US/Makefile.in @@ -25,19 +25,4 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -CHROME_DIR=packages/chatzilla -CHROME_L10N_DIR=chatzilla/locale - -CHROME_L10N = \ - chatzillaOverlay.dtd \ - $(NULL) - -EXPORT_PREF_CONTENT = \ - $(srcdir)/pref-irc.dtd \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(EXPORT_PREF_CONTENT) $(DIST)/bin/chrome/locales/en-US/communicator/locale/pref diff --git a/mozilla/extensions/wallet/cookieviewer/Makefile.in b/mozilla/extensions/wallet/cookieviewer/Makefile.in index b4153bcec7b..86d10a1f377 100644 --- a/mozilla/extensions/wallet/cookieviewer/Makefile.in +++ b/mozilla/extensions/wallet/cookieviewer/Makefile.in @@ -40,8 +40,3 @@ override NO_SHARED_LIB=1 override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk - -install:: $(TARGETS) - $(INSTALL) $(srcdir)/CookieViewer.xul $(srcdir)/CookieViewer.js $(DIST)/bin/chrome/packages/core/communicator/content/wallet - $(INSTALL) $(srcdir)/CookieViewer.properties $(srcdir)/CookieViewer.dtd $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - diff --git a/mozilla/extensions/wallet/cookieviewer/resources/content/Makefile.in b/mozilla/extensions/wallet/cookieviewer/resources/content/Makefile.in index 1268dbe7ecf..e6496a015c1 100644 --- a/mozilla/extensions/wallet/cookieviewer/resources/content/Makefile.in +++ b/mozilla/extensions/wallet/cookieviewer/resources/content/Makefile.in @@ -25,14 +25,5 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/CookieViewer.xul \ - $(srcdir)/CookieViewer.js \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/packages/core/communicator/content/wallet - diff --git a/mozilla/extensions/wallet/cookieviewer/resources/locale/en-US/Makefile.in b/mozilla/extensions/wallet/cookieviewer/resources/locale/en-US/Makefile.in index 7db39098ee1..5d945d83089 100644 --- a/mozilla/extensions/wallet/cookieviewer/resources/locale/en-US/Makefile.in +++ b/mozilla/extensions/wallet/cookieviewer/resources/locale/en-US/Makefile.in @@ -25,14 +25,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/CookieViewer.dtd \ - $(srcdir)/CookieViewer.properties \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet diff --git a/mozilla/extensions/wallet/editor/Makefile.in b/mozilla/extensions/wallet/editor/Makefile.in index 23d78425fd0..eda4cb093b6 100644 --- a/mozilla/extensions/wallet/editor/Makefile.in +++ b/mozilla/extensions/wallet/editor/Makefile.in @@ -40,12 +40,3 @@ override NO_SHARED_LIB=1 override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk - -install:: $(TARGETS) - $(INSTALL) $(srcdir)/WalletEditor.xul $(srcdir)/WalletEditor.js $(srcdir)/privacy.xul $(DIST)/bin/chrome/packages/core/communicator/content/wallet - $(INSTALL) $(srcdir)/interview.html $(srcdir)/index.html $(srcdir)/privacy.html $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - $(INSTALL) $(srcdir)/sample1.html $(srcdir)/sample2.html $(srcdir)/sample3.html $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - $(INSTALL) $(srcdir)/sample4.html $(srcdir)/sample5.html $(srcdir)/sample6.html $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - $(INSTALL) $(srcdir)/sample7.html $(srcdir)/sample8.html $(srcdir)/sample9.html $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - $(INSTALL) $(srcdir)/sample10.html $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - $(INSTALL) $(srcdir)/WalletEditor.properties $(srcdir)/WalletEditor.dtd $(srcdir)/privacy.dtd $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet diff --git a/mozilla/extensions/wallet/editor/resources/content/Makefile.in b/mozilla/extensions/wallet/editor/resources/content/Makefile.in index 4422816452e..e6496a015c1 100644 --- a/mozilla/extensions/wallet/editor/resources/content/Makefile.in +++ b/mozilla/extensions/wallet/editor/resources/content/Makefile.in @@ -25,14 +25,5 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/WalletEditor.xul \ - $(srcdir)/WalletEditor.js \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/packages/core/communicator/content/wallet - diff --git a/mozilla/extensions/wallet/editor/resources/locale/en-US/Makefile.in b/mozilla/extensions/wallet/editor/resources/locale/en-US/Makefile.in index 8e183073d99..835e9dc258d 100644 --- a/mozilla/extensions/wallet/editor/resources/locale/en-US/Makefile.in +++ b/mozilla/extensions/wallet/editor/resources/locale/en-US/Makefile.in @@ -25,14 +25,5 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/WalletEditor.dtd \ - $(srcdir)/WalletEditor.properties \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - diff --git a/mozilla/extensions/wallet/signonviewer/Makefile.in b/mozilla/extensions/wallet/signonviewer/Makefile.in index 5ebb60b45f7..9e8a7d597ff 100644 --- a/mozilla/extensions/wallet/signonviewer/Makefile.in +++ b/mozilla/extensions/wallet/signonviewer/Makefile.in @@ -41,7 +41,3 @@ override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk -install:: $(TARGETS) - $(INSTALL) $(srcdir)/SignonViewer.xul $(srcdir)/SignonViewer.js $(DIST)/bin/chrome/packages/core/communicator/content/wallet - $(INSTALL) $(srcdir)/SignonViewer.properties $(srcdir)/SignonViewer.dtd $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - diff --git a/mozilla/extensions/wallet/signonviewer/resources/content/Makefile.in b/mozilla/extensions/wallet/signonviewer/resources/content/Makefile.in index 1616b49f499..a70700653a4 100644 --- a/mozilla/extensions/wallet/signonviewer/resources/content/Makefile.in +++ b/mozilla/extensions/wallet/signonviewer/resources/content/Makefile.in @@ -28,6 +28,3 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -install:: $(TARGETS) - $(INSTALL) $(srcdir)/SignonViewer.xul $(srcdir)/SignonViewer.js $(DIST)/bin/chrome/packages/core/communicator/content/wallet - diff --git a/mozilla/extensions/wallet/signonviewer/resources/locale/en-US/Makefile.in b/mozilla/extensions/wallet/signonviewer/resources/locale/en-US/Makefile.in index 701901d4e07..9763c16b6ce 100644 --- a/mozilla/extensions/wallet/signonviewer/resources/locale/en-US/Makefile.in +++ b/mozilla/extensions/wallet/signonviewer/resources/locale/en-US/Makefile.in @@ -28,7 +28,4 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -install:: $(TARGETS) - $(INSTALL) SignonViewer.properties SignonViewer.dtd $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in index 525f1cf1052..339fd6c8929 100644 --- a/mozilla/extensions/wallet/src/Makefile.in +++ b/mozilla/extensions/wallet/src/Makefile.in @@ -46,11 +46,6 @@ DEFAULTS_FILES = \ $(srcdir)/SchemaConcat.tbl \ $(NULL) -CHROME_FILES = \ - $(srcdir)/cookie.properties \ - $(srcdir)/wallet.properties \ - $(NULL) - EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ $(NSPR_LIBS) \ @@ -61,5 +56,4 @@ include $(topsrcdir)/config/rules.mk install:: $(INSTALL) $(DEFAULTS_FILES) $(DIST)/bin/defaults/wallet - $(INSTALL) $(CHROME_FILES) $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet diff --git a/mozilla/extensions/wallet/src/resources/locale/en-US/Makefile.in b/mozilla/extensions/wallet/src/resources/locale/en-US/Makefile.in index 231b1417127..9763c16b6ce 100644 --- a/mozilla/extensions/wallet/src/resources/locale/en-US/Makefile.in +++ b/mozilla/extensions/wallet/src/resources/locale/en-US/Makefile.in @@ -26,13 +26,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/cookie.properties \ - $(srcdir)/wallet.properties \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet diff --git a/mozilla/extensions/wallet/walletpreview/Makefile.in b/mozilla/extensions/wallet/walletpreview/Makefile.in index 1fa48cd68a1..472c48727be 100644 --- a/mozilla/extensions/wallet/walletpreview/Makefile.in +++ b/mozilla/extensions/wallet/walletpreview/Makefile.in @@ -41,7 +41,3 @@ override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk -install:: $(TARGETS) - $(INSTALL) $(srcdir)/WalletPreview.xul $(srcdir)/WalletPreview.js $(DIST)/bin/chrome/packages/core/communicator/content/wallet - $(INSTALL) $(srcdir)/WalletPreview.properties $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - diff --git a/mozilla/extensions/wallet/walletpreview/resources/content/Makefile.in b/mozilla/extensions/wallet/walletpreview/resources/content/Makefile.in index 4b4335c356c..48b5bf749fd 100644 --- a/mozilla/extensions/wallet/walletpreview/resources/content/Makefile.in +++ b/mozilla/extensions/wallet/walletpreview/resources/content/Makefile.in @@ -27,7 +27,3 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk - -install:: $(TARGETS) - $(INSTALL) $(srcdir)/WalletPreview.xul $(srcdir)/WalletPreview.js $(DIST)/bin/chrome/packages/core/communicator/content/wallet - diff --git a/mozilla/extensions/wallet/walletpreview/resources/locale/en-US/Makefile.in b/mozilla/extensions/wallet/walletpreview/resources/locale/en-US/Makefile.in index f932476639d..f21c6e7eb7f 100644 --- a/mozilla/extensions/wallet/walletpreview/resources/locale/en-US/Makefile.in +++ b/mozilla/extensions/wallet/walletpreview/resources/locale/en-US/Makefile.in @@ -28,6 +28,3 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -install:: $(TARGETS) - $(INSTALL) $(srcdir)/WalletPreview.properties $(DIST)/bin/chrome/locales/en-US/communicator/locale/wallet - diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in index 1484f74bd63..9b83a8b26b9 100644 --- a/mozilla/intl/uconv/src/Makefile.in +++ b/mozilla/intl/uconv/src/Makefile.in @@ -54,11 +54,7 @@ CPPSRCS = \ EXPORT_RESOURCE = \ $(srcdir)/charsetalias.properties \ $(srcdir)/charsetData.properties \ - $(srcdir)/acceptlanguage.properties \ - $(NULL) - -EXPORT_LOCALE = \ - $(srcdir)/charsetTitles.properties \ + $(srcdir)/acceptlanguage.properties \ $(NULL) ifeq ($(MOZ_WIDGET_TOOLKIT),os2) @@ -95,4 +91,3 @@ endif install:: $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res - $(INSTALL) $(EXPORT_LOCALE) $(DIST)/bin/chrome/locales/en-US/global/locale diff --git a/mozilla/mailnews/Makefile.in b/mozilla/mailnews/Makefile.in index fced5adc013..2dec143370e 100644 --- a/mozilla/mailnews/Makefile.in +++ b/mozilla/mailnews/Makefile.in @@ -30,3 +30,6 @@ DIRS = idl public base db news local mime compose imap addrbook import absync include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) content messenger messenger.jar; \ + $(REGCHROME) locale en-US/messenger en-US.jar diff --git a/mozilla/mailnews/absync/resources/locale/en-US/Makefile.in b/mozilla/mailnews/absync/resources/locale/en-US/Makefile.in index f589a0cf909..579374c6fb3 100644 --- a/mozilla/mailnews/absync/resources/locale/en-US/Makefile.in +++ b/mozilla/mailnews/absync/resources/locale/en-US/Makefile.in @@ -26,12 +26,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/absync.properties \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/messenger/locale/addressbook diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/Makefile.in b/mozilla/mailnews/addrbook/prefs/resources/content/Makefile.in index 6b0cbd61178..48b5bf749fd 100644 --- a/mozilla/mailnews/addrbook/prefs/resources/content/Makefile.in +++ b/mozilla/mailnews/addrbook/prefs/resources/content/Makefile.in @@ -26,17 +26,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -SAMPLES_DIR = $(DIST)/bin/chrome/packages/messenger/messenger/content/addressbook - -EXPORT_RESOURCE_SAMPLES = \ - pref-addressing.xul \ - pref-addressbookOverlay.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/mailnews/addrbook/prefs/resources/locale/en-US/Makefile.in b/mozilla/mailnews/addrbook/prefs/resources/locale/en-US/Makefile.in index 49fd6e1f93d..f21c6e7eb7f 100644 --- a/mozilla/mailnews/addrbook/prefs/resources/locale/en-US/Makefile.in +++ b/mozilla/mailnews/addrbook/prefs/resources/locale/en-US/Makefile.in @@ -28,6 +28,3 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(srcdir)/pref-addressing.dtd $(DIST)/bin/chrome/locales/en-US/messenger/locale/addressbook - diff --git a/mozilla/mailnews/addrbook/resources/content/Makefile.in b/mozilla/mailnews/addrbook/resources/content/Makefile.in index fc1a6dac3c9..4ff84551ff6 100644 --- a/mozilla/mailnews/addrbook/resources/content/Makefile.in +++ b/mozilla/mailnews/addrbook/resources/content/Makefile.in @@ -26,35 +26,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -SAMPLES_DIR = $(DIST)/bin/chrome/packages/messenger/messenger/content/addressbook - -EXPORT_RESOURCE_SAMPLES = \ - abAddressBookNameDialog.js \ - abAddressBookNameDialog.xul \ - abCardOverlay.js \ - abCardOverlay.xul \ - abCardViewOverlay.js \ - abCardViewOverlay.xul \ - abCommon.js \ - abDirTreeOverlay.xul \ - abEditCardDialog.xul \ - abNewCardDialog.xul \ - abResultsTreeOverlay.xul \ - abSelectAddressesDialog.js \ - abSelectAddressesDialog.xul \ - addressbook.js \ - addressbook.xul \ - abDragDrop.js \ - abMailListDialog.js \ - abMailListDialog.xul \ - abListOverlay.xul \ - abEditListDialog.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/mailnews/addrbook/resources/locale/en-US/Makefile.in b/mozilla/mailnews/addrbook/resources/locale/en-US/Makefile.in index fe4171c9f5a..a70700653a4 100644 --- a/mozilla/mailnews/addrbook/resources/locale/en-US/Makefile.in +++ b/mozilla/mailnews/addrbook/resources/locale/en-US/Makefile.in @@ -26,21 +26,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/abAddressBookNameDialog.dtd \ - $(srcdir)/abCardOverlay.dtd \ - $(srcdir)/abCardViewOverlay.dtd \ - $(srcdir)/abDirTreeOverlay.dtd \ - $(srcdir)/abMainWindow.dtd \ - $(srcdir)/abNewCardDialog.dtd \ - $(srcdir)/abResultsTreeOverlay.dtd \ - $(srcdir)/abSelectAddressesDialog.dtd \ - $(srcdir)/abMailListDialog.dtd \ - $(srcdir)/addressBook.properties \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/messenger/locale/addressbook - diff --git a/mozilla/mailnews/base/ispdata/Makefile.in b/mozilla/mailnews/base/ispdata/Makefile.in index f8ef3353096..de9b7afe02f 100644 --- a/mozilla/mailnews/base/ispdata/Makefile.in +++ b/mozilla/mailnews/base/ispdata/Makefile.in @@ -26,17 +26,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_DIR = $(DIST)/bin/chrome/locales/en-US/messenger/locale/isp - -EXPORT_RESOURCE_FILES = \ - aol.rdf \ - example.rdf \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(EXPORT_DIR)/, $(EXPORT_RESOURCE_FILES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_FILES)) $(EXPORT_DIR) - diff --git a/mozilla/mailnews/base/resources/content/unix/Makefile.in b/mozilla/mailnews/base/resources/content/unix/Makefile.in index 0a63fb6ee88..b96a744038d 100644 --- a/mozilla/mailnews/base/resources/content/unix/Makefile.in +++ b/mozilla/mailnews/base/resources/content/unix/Makefile.in @@ -26,12 +26,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/platformMailnewsOverlay.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/packages/messenger/messenger/content diff --git a/mozilla/mailnews/imap/resources/locale/en-US/Makefile.in b/mozilla/mailnews/imap/resources/locale/en-US/Makefile.in index 69017469ccf..a70700653a4 100644 --- a/mozilla/mailnews/imap/resources/locale/en-US/Makefile.in +++ b/mozilla/mailnews/imap/resources/locale/en-US/Makefile.in @@ -28,6 +28,3 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(srcdir)/imapMsgs.properties $(DIST)/bin/chrome/locales/en-US/messenger/locale - diff --git a/mozilla/mailnews/local/resources/locale/en-US/Makefile.in b/mozilla/mailnews/local/resources/locale/en-US/Makefile.in index 8925dffedf9..579374c6fb3 100644 --- a/mozilla/mailnews/local/resources/locale/en-US/Makefile.in +++ b/mozilla/mailnews/local/resources/locale/en-US/Makefile.in @@ -28,6 +28,4 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(srcdir)/localMsgs.properties $(DIST)/bin/chrome/locales/en-US/messenger/locale diff --git a/mozilla/mailnews/mime/abstatus/resources/skin/Makefile.in b/mozilla/mailnews/mime/abstatus/resources/skin/Makefile.in index c67e1e07b1c..a70700653a4 100644 --- a/mozilla/mailnews/mime/abstatus/resources/skin/Makefile.in +++ b/mozilla/mailnews/mime/abstatus/resources/skin/Makefile.in @@ -28,6 +28,3 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(srcdir)/abookstat.gif $(DIST)/bin/chrome/skins/modern/messenger/skin - diff --git a/mozilla/mailnews/mime/cthandlers/resources/Makefile.in b/mozilla/mailnews/mime/cthandlers/resources/Makefile.in index 7e47406263a..a3168e544c9 100644 --- a/mozilla/mailnews/mime/cthandlers/resources/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/resources/Makefile.in @@ -28,6 +28,3 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(srcdir)/vcard.properties $(DIST)/bin/chrome/locales/en-US/messenger/locale - diff --git a/mozilla/mailnews/mime/resources/Makefile.in b/mozilla/mailnews/mime/resources/Makefile.in index 98b3c9d3097..c8df5b0dde7 100644 --- a/mozilla/mailnews/mime/resources/Makefile.in +++ b/mozilla/mailnews/mime/resources/Makefile.in @@ -29,8 +29,3 @@ include $(DEPTH)/config/autoconf.mk DIRS = content include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(srcdir)/mime.properties $(DIST)/bin/chrome/locales/en-US/messenger/locale - $(INSTALL) $(srcdir)/mimeheader.properties $(DIST)/bin/chrome/locales/en-US/messenger/locale - diff --git a/mozilla/modules/libjar/nsJAR.cpp b/mozilla/modules/libjar/nsJAR.cpp index 640ee100d9d..21a51a19cc7 100644 --- a/mozilla/modules/libjar/nsJAR.cpp +++ b/mozilla/modules/libjar/nsJAR.cpp @@ -1119,7 +1119,7 @@ nsZipReaderCache::nsZipReaderCache() NS_IMETHODIMP nsZipReaderCache::Init(PRUint32 cacheSize) { -#ifdef DEBUG_warren +#ifdef xDEBUG_warren mCacheSize = 1;//cacheSize; // XXX hack #else mCacheSize = cacheSize; diff --git a/mozilla/netwerk/resources/Makefile.in b/mozilla/netwerk/resources/Makefile.in index ee85395405b..8652e6461a7 100644 --- a/mozilla/netwerk/resources/Makefile.in +++ b/mozilla/netwerk/resources/Makefile.in @@ -30,3 +30,6 @@ DIRS = content locale include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) locale en-US/necko en-US.jar + diff --git a/mozilla/netwerk/resources/content/Makefile.in b/mozilla/netwerk/resources/content/Makefile.in index 8e04f373ca4..de9b7afe02f 100644 --- a/mozilla/netwerk/resources/content/Makefile.in +++ b/mozilla/netwerk/resources/content/Makefile.in @@ -26,16 +26,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CHROME_DIR = $(DIST)/bin/chrome/packages/core/necko/content - -EXPORT_RESOURCES = \ - redirect_loop.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(CHROME_DIR)/, $(EXPORT_RESOURCES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCES)) $(CHROME_DIR) - diff --git a/mozilla/netwerk/resources/locale/en-US/Makefile.in b/mozilla/netwerk/resources/locale/en-US/Makefile.in index b959f5c471c..d46db6f094e 100644 --- a/mozilla/netwerk/resources/locale/en-US/Makefile.in +++ b/mozilla/netwerk/resources/locale/en-US/Makefile.in @@ -26,13 +26,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/necko.properties \ - $(srcdir)/redirect_loop.dtd \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/necko/locale diff --git a/mozilla/profile/pref-migrator/resources/content/Makefile.in b/mozilla/profile/pref-migrator/resources/content/Makefile.in index af1488135eb..96f2a4b8376 100644 --- a/mozilla/profile/pref-migrator/resources/content/Makefile.in +++ b/mozilla/profile/pref-migrator/resources/content/Makefile.in @@ -27,14 +27,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FILES = \ - profileMigrationProgress.js \ - profileMigrationProgress.xul \ - no_space.xul \ - no_space.js \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/chrome/packages/core/communicator/content/profile diff --git a/mozilla/profile/pref-migrator/resources/locale/en-US/Makefile.in b/mozilla/profile/pref-migrator/resources/locale/en-US/Makefile.in index 80eccfa9cf6..4411e69ed2a 100644 --- a/mozilla/profile/pref-migrator/resources/locale/en-US/Makefile.in +++ b/mozilla/profile/pref-migrator/resources/locale/en-US/Makefile.in @@ -27,12 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FILES = \ - profileMigrationProgress.dtd \ - no_space.dtd \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/chrome/locales/en-US/communicator/locale/profile diff --git a/mozilla/profile/resources/content/Makefile.in b/mozilla/profile/resources/content/Makefile.in index b61cb83aec2..5234e4fb72e 100644 --- a/mozilla/profile/resources/content/Makefile.in +++ b/mozilla/profile/resources/content/Makefile.in @@ -27,27 +27,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FILES = \ - createProfileWizard.js \ - createProfileWizard.xul \ - profileManager.js \ - deleteProfile.js \ - deleteProfile.xul \ - migrateAllProfile.xul \ - newProfile1_1.xul \ - newProfile1_2.xul \ - newProfile1_1.js \ - newProfile1_2.js \ - profileSelection.xul \ - profileSelection.js \ - confirmMigration.xul \ - confirmMigration.js \ - selectLang.xul \ - selectLang.js \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/chrome/packages/core/communicator/content/profile - diff --git a/mozilla/profile/resources/locale/en-US/Makefile.in b/mozilla/profile/resources/locale/en-US/Makefile.in index cc68581e2ef..a3168e544c9 100644 --- a/mozilla/profile/resources/locale/en-US/Makefile.in +++ b/mozilla/profile/resources/locale/en-US/Makefile.in @@ -26,24 +26,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -FILES = \ - createProfileWizard.dtd \ - newProfile1_1.dtd \ - newProfile1_2.dtd \ - profileManager.properties \ - profileManagerDelete.dtd \ - profileManagerMigrateAll.dtd \ - createProfileWizard.properties \ - newProfile1_2.properties \ - migration.properties \ - profileSelection.dtd \ - confirmMigration.dtd \ - selectLang.dtd \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/chrome/locales/en-US/communicator/locale/profile - diff --git a/mozilla/security/base/res/content/Makefile.in b/mozilla/security/base/res/content/Makefile.in index 44452af4d18..7b4e57ecf86 100644 --- a/mozilla/security/base/res/content/Makefile.in +++ b/mozilla/security/base/res/content/Makefile.in @@ -26,13 +26,3 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk - -COMMUNICATOR_CONTENT_DIR = $(DIST)/bin/chrome/packages/core/communicator/content -COMMUNICATOR_EXPORT_CONTENT = \ - $(srcdir)/securityOverlay.xul \ - $(srcdir)/securityUI.js \ - $(srcdir)/PSMTaskMenu.xul \ - $(NULL) - -install:: - $(INSTALL) $(COMMUNICATOR_EXPORT_CONTENT) $(COMMUNICATOR_CONTENT_DIR) diff --git a/mozilla/security/base/res/locale/en-US/Makefile.in b/mozilla/security/base/res/locale/en-US/Makefile.in index 5957f5a8ff8..457dbe45490 100644 --- a/mozilla/security/base/res/locale/en-US/Makefile.in +++ b/mozilla/security/base/res/locale/en-US/Makefile.in @@ -25,17 +25,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -COMMUNICATOR_RESOURCE_CONTENT = \ - $(srcdir)/PSMTaskMenu.dtd \ - $(srcdir)/security.properties \ - $(srcdir)/securityOverlay.dtd \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(COMMUNICATOR_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/communicator/locale - - diff --git a/mozilla/themes/blue/Makefile.in b/mozilla/themes/blue/Makefile.in index ab5553d28ed..41963b54d94 100644 --- a/mozilla/themes/blue/Makefile.in +++ b/mozilla/themes/blue/Makefile.in @@ -28,16 +28,13 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -CHROME_DIR = skins/$(THEME) -CHROME_MISC_DIR = . -CHROME_TYPE = skin - -CHROME_MISC = \ - manifest.rdf \ - preview.png \ - $(NULL) - DIRS = communicator global navigator editor messenger include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) skin blue/communicator blue.jar; \ + $(REGCHROME) skin blue/editor blue.jar; \ + $(REGCHROME) skin blue/global blue.jar; \ + $(REGCHROME) skin blue/messenger blue.jar; \ + $(REGCHROME) skin blue/navigator blue.jar diff --git a/mozilla/themes/blue/communicator/Makefile.in b/mozilla/themes/blue/communicator/Makefile.in index 5c2cefe4a5e..6c883041084 100644 --- a/mozilla/themes/blue/communicator/Makefile.in +++ b/mozilla/themes/blue/communicator/Makefile.in @@ -28,38 +28,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -EXPORT_RESOURCE = \ - $(srcdir)/brand.css \ - $(srcdir)/securityOverlay.css \ - $(srcdir)/box.css \ - $(srcdir)/button.css \ - $(srcdir)/communicator.css \ - $(srcdir)/formatting.css \ - $(srcdir)/menubuttonBindings.xml \ - $(srcdir)/menubutton.css \ - $(srcdir)/splitter.css \ - $(srcdir)/toolbar.css \ - $(srcdir)/navbar-endbox.gif \ - $(srcdir)/tb-menubutton-dm.gif \ - $(srcdir)/tb-menubutton-dm-disabled.gif \ - $(srcdir)/online.gif \ - $(srcdir)/offline.gif \ - $(srcdir)/document.gif \ - $(srcdir)/document-error.gif \ - $(srcdir)/lock.gif \ - $(srcdir)/unlock.gif \ - $(srcdir)/broken.gif \ - $(srcdir)/tasksOverlay.css \ - $(srcdir)/dialogOverlay.css \ - $(srcdir)/prefpanels.css \ - $(srcdir)/content-large.gif \ - $(srcdir)/content-small.gif \ - $(NULL) - DIRS = search xpinstall sidebar bookmarks directory profile regviewer related include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin diff --git a/mozilla/themes/blue/communicator/bookmarks/Makefile.in b/mozilla/themes/blue/communicator/bookmarks/Makefile.in index 63d23b081f9..a985096314d 100644 --- a/mozilla/themes/blue/communicator/bookmarks/Makefile.in +++ b/mozilla/themes/blue/communicator/bookmarks/Makefile.in @@ -28,29 +28,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/bookmarks - -EXPORT_RESOURCE_SAMPLES = \ - bookmark-folder-closed.gif \ - bookmark-folder-closed-sel.gif \ - bookmark-folder-open.gif \ - bookmark-folder-open-sel.gif \ - home.gif \ - home-sel.gif \ - bookmark-item.gif \ - bookmarks.css \ - iefavorite.gif \ - personal-folder-closed.gif \ - personal-folder-closed-sel.gif \ - personal-folder-open.gif \ - personal-folder-open-sel.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/communicator/directory/Makefile.in b/mozilla/themes/blue/communicator/directory/Makefile.in index 8fdb7ccd8c4..652a758dd68 100644 --- a/mozilla/themes/blue/communicator/directory/Makefile.in +++ b/mozilla/themes/blue/communicator/directory/Makefile.in @@ -27,23 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/directory - -EXPORT_RESOURCE_SAMPLES = \ - directory.css \ - file-folder-closed-sel.gif \ - file-folder-closed.gif \ - file-folder-open-sel.gif \ - file-folder-open.gif \ - file-icon-sel.gif \ - file-icon.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/communicator/profile/Makefile.in b/mozilla/themes/blue/communicator/profile/Makefile.in index 0ef6b365f99..652a758dd68 100644 --- a/mozilla/themes/blue/communicator/profile/Makefile.in +++ b/mozilla/themes/blue/communicator/profile/Makefile.in @@ -27,21 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/profile - -EXPORT_RESOURCE_SAMPLES = \ - newProfile1_2.css \ - profileicon-large.gif \ - profile.css \ - migrate.gif \ - profileManager.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/communicator/regviewer/Makefile.in b/mozilla/themes/blue/communicator/regviewer/Makefile.in index 83768d87d43..652a758dd68 100644 --- a/mozilla/themes/blue/communicator/regviewer/Makefile.in +++ b/mozilla/themes/blue/communicator/regviewer/Makefile.in @@ -27,17 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/regviewer - -EXPORT_RESOURCE_SAMPLES = \ - regviewer.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/communicator/related/Makefile.in b/mozilla/themes/blue/communicator/related/Makefile.in index 45b8249393e..652a758dd68 100644 --- a/mozilla/themes/blue/communicator/related/Makefile.in +++ b/mozilla/themes/blue/communicator/related/Makefile.in @@ -27,18 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/related - -EXPORT_RESOURCE_SAMPLES = \ - related.css \ - sitemap.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/communicator/search/Makefile.in b/mozilla/themes/blue/communicator/search/Makefile.in index c72f070008e..652a758dd68 100644 --- a/mozilla/themes/blue/communicator/search/Makefile.in +++ b/mozilla/themes/blue/communicator/search/Makefile.in @@ -27,24 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/search - -EXPORT_RESOURCE_SAMPLES = \ - icons.css \ - result.gif \ - category.gif \ - internet.css \ - search-editor.css \ - findresults.css \ - internetresults.css \ - search.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/communicator/sidebar/Makefile.in b/mozilla/themes/blue/communicator/sidebar/Makefile.in index c7739e6004b..652a758dd68 100644 --- a/mozilla/themes/blue/communicator/sidebar/Makefile.in +++ b/mozilla/themes/blue/communicator/sidebar/Makefile.in @@ -27,39 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/sidebar - -EXPORT_RESOURCE_SAMPLES = \ - list-up-dis.gif \ - sidebar-icon.gif \ - customize.css \ - list-up.gif \ - sidebar-topright-cap.gif \ - list-down-dis.gif \ - preview.css \ - sidebar.css \ - list-down.gif \ - sidebar-bottomright-cap.gif \ - sidebarSplitterBindings.xml \ - sbgrippy-left-hover.gif \ - sbgrippy-left.gif \ - sbgrippy-right-hover.gif \ - sbgrippy-right.gif \ - sbgrippy-up-hover.gif \ - sbgrippy-up.gif \ - sbgrippy-down-hover.gif \ - sbgrippy-down.gif \ - sidebar-close-hover.gif \ - sidebar-close.gif \ - sidebar-open-hover.gif \ - sidebar-open.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/communicator/xpinstall/Makefile.in b/mozilla/themes/blue/communicator/xpinstall/Makefile.in index 97afddcabfe..652a758dd68 100644 --- a/mozilla/themes/blue/communicator/xpinstall/Makefile.in +++ b/mozilla/themes/blue/communicator/xpinstall/Makefile.in @@ -27,17 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/xpinstall - -EXPORT_RESOURCE_SAMPLES = \ - xpinstall.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/editor/Makefile.in b/mozilla/themes/blue/editor/Makefile.in index f82286e1b8c..e29fa18d243 100644 --- a/mozilla/themes/blue/editor/Makefile.in +++ b/mozilla/themes/blue/editor/Makefile.in @@ -28,22 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/editor/skin - -EXPORT_RESOURCE_SAMPLES = \ - EdImageMapPage.css \ - EditorToolbars.css \ - EdImageMap.css \ - EditorDialog.css \ - editor.css \ - $(NULL) - DIRS = images include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/editor/images/Makefile.in b/mozilla/themes/blue/editor/images/Makefile.in index da45b54f1cb..652a758dd68 100644 --- a/mozilla/themes/blue/editor/images/Makefile.in +++ b/mozilla/themes/blue/editor/images/Makefile.in @@ -27,88 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/editor/skin/images - -EXPORT_RESOURCE_SAMPLES = \ - Map_Copy.gif \ - Map_Cut.gif \ - Map_Paste.gif \ - Map_checker.gif \ - Map_circleTool.gif \ - Map_contrast.gif \ - Map_pointerTool.gif \ - Map_polygonTool.gif \ - Map_rectangleTool.gif \ - Map_zoomIn.gif \ - Map_zoomOut.gif \ - align.gif \ - anchor-in-doc.gif \ - anchor-white.gif \ - anchor.gif \ - bold.gif \ - bold_disabled.gif \ - bullets.gif \ - bullets_disabled.gif \ - center.gif \ - center_disabled.gif \ - color.gif \ - dec-font-size.gif \ - dec-font-size_disabled.gif \ - div.gif \ - find.gif \ - hline-white.gif \ - hline.gif \ - hover-teal.gif \ - image-white.gif \ - image.gif \ - img-align-bottom.gif \ - img-align-left.gif \ - img-align-middle.gif \ - img-align-right.gif \ - img-align-top.gif \ - inc-font-size.gif \ - inc-font-size_disabled.gif \ - indent.gif \ - indent_disabled.gif \ - italic.gif \ - italic_disabled.gif \ - justify.gif \ - justify_disabled.gif \ - left.gif \ - left_disabled.gif \ - link-white.gif \ - link.gif \ - newfile.gif \ - numbers.gif \ - numbers_disabled.gif \ - object-popup.gif \ - openfile.gif \ - outdent.gif \ - outdent_disabled.gif \ - preview.gif \ - print.gif \ - publish.gif \ - right.gif \ - right_disabled.gif \ - savefile.gif \ - savemod.gif \ - span.gif \ - spell.gif \ - table-white.gif \ - table.gif \ - underline.gif \ - underline_disabled.gif \ - editmode-normal.gif \ - editmode-tags.gif \ - editmode-html.gif \ - editmode-preview.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/global/Makefile.in b/mozilla/themes/blue/global/Makefile.in index 213d5e7eccf..906febe19ad 100644 --- a/mozilla/themes/blue/global/Makefile.in +++ b/mozilla/themes/blue/global/Makefile.in @@ -27,150 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/global/skin - -# split EXPORT_RESOURCE_SAMPLES in two otherwise the generated commands -# can be too long for some systems. -EXPORT_RESOURCE_SAMPLES_1 = \ - alert-icon.gif \ - animthrob.gif \ - animthrob_single.gif \ - blank.gif \ - box.css \ - button.css \ - button28-bg-active.gif \ - button28-bg-disabled.gif \ - button28-bg-hover.gif \ - button28-bg.gif \ - button32-bg-active.gif \ - button32-bg-disabled.gif \ - button32-bg-hover.gif \ - button32-bg.gif \ - check-check-disabled.gif \ - check-check.gif \ - check-radio-disabled.gif \ - check-radio.gif \ - checkbox.css \ - closedtwisty-selected.gif \ - closedtwisty.gif \ - columnselect.gif \ - columnselect-hover.gif \ - commonDialog.css \ - console.css \ - dir-closed.gif \ - dir-open.gif \ - error-icon.gif \ - filepicker.css \ - formatting.css \ - global.css \ - gray-bottomleft.gif \ - gray-bottomright.gif \ - gray-topright.gif \ - grippy-horizontal-after.gif \ - grippy-horizontal-before.gif \ - grippy-vertical-after.gif \ - grippy-vertical-before.gif \ - lessCOls_dis.gif \ - lessCols.gif \ - lessCols_mo.gif \ - menu-arrow-disabled.gif \ - menu-arrow-hover.gif \ - menu-arrow.gif \ - menu-check-disabled.gif \ - menu-check-hover.gif \ - menu-check.gif \ - menu-radio-disabled.gif \ - menu-radio-hover.gif \ - menu-radio.gif \ - menu.css \ - menubutton.css \ - menulist.css \ - message-icon.gif \ - moreCols.gif \ - moreCols_dis.gif \ - moreCols_mo.gif \ - n-box-navbar.gif \ - n-box.gif \ - navbar-bg-begincap.gif \ - navbar-bg.gif \ - navbar-endcap.gif \ - opentwisty-selected.gif \ - opentwisty.gif \ - otherbutton28-bg-active.gif \ - otherbutton28-bg-hover.gif \ - print.gif \ - progressmeter-busy.gif \ - question-icon.gif \ - radio.css \ - return-disabled.gif \ - return.gif - -EXPORT_RESOURCE_SAMPLES_2 = \ - arrow-up.gif \ - arrow-down.gif \ - arrow-left.gif \ - arrow-right.gif \ - scroll-down-disabled.gif \ - scroll-down-hover.gif \ - scroll-down.gif \ - scroll-left-disabled.gif \ - scroll-left-hover.gif \ - scroll-left.gif \ - scroll-right-disabled.gif \ - scroll-right-hover.gif \ - scroll-right.gif \ - scroll-thumb-horiz-disabled.gif \ - scroll-thumb-horiz-hover.gif \ - scroll-thumb-horiz.gif \ - scroll-thumb-vert-disabled.gif \ - scroll-thumb-vert-hover.gif \ - scroll-thumb-vert.gif \ - scroll-up-disabled.gif \ - scroll-up-hover.gif \ - scroll-up.gif \ - scrollbars.css \ - search.gif \ - seltab-leftedge.gif \ - seltab-rightedge.gif \ - sortAscending.gif \ - sortDescending.gif \ - stop.gif \ - tab-leftedge.gif \ - tab-rightedge.gif \ - taskbar-addressbook.gif \ - taskbar-composer.gif \ - taskbar-mail.gif \ - taskbar-mailnew.gif \ - taskbar-navigator.gif \ - taskbar-popup-arrow.gif \ - taskbar-tab-hover.gif \ - taskbar-tab-minimized.gif \ - taskbar-tab-trans.gif \ - taskbar-tab.gif \ - textfield.css \ - toolbar-begincap.gif \ - toolbar-dropdown-hover.gif \ - toolbar-dropdown.gif \ - toolbar-endcap.gif \ - toolbar-menu-arrow-disabled.gif \ - toolbar-menu-arrow-hover.gif \ - toolbar-menu-arrow.gif \ - toolbar.css \ - tree.css \ - wizardOverlay.css \ - splitter.css \ - tabcontrol.css \ - loading.gif \ - globalBindings.xml \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_1)) $(SAMPLES_DIR) - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_2)) $(SAMPLES_DIR) - -distclean clean clobber realclean clobber_all:: - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_1)) - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_2)) diff --git a/mozilla/themes/blue/messenger/Makefile.in b/mozilla/themes/blue/messenger/Makefile.in index ba3e93edfa4..4a7c7e58ba2 100644 --- a/mozilla/themes/blue/messenger/Makefile.in +++ b/mozilla/themes/blue/messenger/Makefile.in @@ -28,118 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin - -EXPORT_RESOURCE_SAMPLES = \ - AccountManager.css \ - addtoab.gif \ - attach.gif \ - check.gif \ - dot.gif \ - fieldMapImport.css \ - file.gif \ - flagcol.gif \ - flaggedmail.gif \ - folder-closed.gif \ - folder-draft-open.gif \ - folder-draft-share-open.gif \ - folder-draft-share.gif \ - folder-draft.gif \ - folder-filed-open.gif \ - folder-filed.gif \ - folder-hasmail.gif \ - folder-inbox-new.gif \ - folder-inbox-open.gif \ - folder-inbox-share-open.gif \ - folder-inbox-share.gif \ - folder-inbox.gif \ - folder-mailserver.gif \ - folder-new-closed.gif \ - folder-new-open.gif \ - folder-new.gif \ - folder-newsgroup-new.gif \ - folder-newsgroup.gif \ - folder-open.gif \ - folder-outbox-open.gif \ - folder-outbox.gif \ - folder-sent-open.gif \ - folder-sent-share-open.gif \ - folder-sent-share.gif \ - folder-sent.gif \ - folder-server-open.gif \ - folder-server.gif \ - folder-share-open.gif \ - folder-share.gif \ - folder-template-open.gif \ - folder-template-share-open.gif \ - folder-template-share.gif \ - folder-template.gif \ - folder-trash-open.gif \ - folder-trash-share-open.gif \ - folder-trash-share.gif \ - folder-trash.gif \ - folderPane.css \ - forward.gif \ - frown.gif \ - getmsg.gif \ - inbox.gif \ - less.gif \ - local-mailhost.gif \ - mailfolder.gif \ - mailheader.css \ - message-mail-attach.gif \ - message-mail-imapdelete.gif \ - message-mail-new.gif \ - message-mail.gif \ - message-news-new.gif \ - message-news.gif \ - messenger.css \ - more.gif \ - msgHdrViewOverlay.css \ - newmsg.gif \ - newshost.gif \ - next.gif \ - open-mailfolder.gif \ - outbox.gif \ - pref-mailnews.css \ - readcol.gif \ - readmail.gif \ - reply.gif \ - replyall.gif \ - server-local-new.gif \ - server-local.gif \ - server-mail-new.gif \ - server-mail.gif \ - server-news-lock.gif \ - server-news-new.gif \ - server-news.gif \ - server-remote-lock.gif \ - server-remote.gif \ - sick.gif \ - smile.gif \ - subscribe.css \ - threadPane.css \ - threadcol.gif \ - thread-open.gif \ - thread-closed.gif \ - thread-new-open.gif \ - thread-new-closed.gif \ - trash.gif \ - unreadmail.gif \ - unthreadcol.gif \ - winclassic.gif \ - wink.gif \ - winwide.gif \ - wizard.css \ - importDialog.css \ - $(NULL) - DIRS = addressbook messengercompose include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/messenger/addressbook/Makefile.in b/mozilla/themes/blue/messenger/addressbook/Makefile.in index d4a72f375a1..5f126d8fa17 100644 --- a/mozilla/themes/blue/messenger/addressbook/Makefile.in +++ b/mozilla/themes/blue/messenger/addressbook/Makefile.in @@ -27,26 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin/addressbook - -EXPORT_RESOURCE_SAMPLES = \ - addressbook.css \ - newcard.gif \ - newlist.gif \ - edit.gif \ - property.gif \ - abnewmsg.gif \ - newmsgab.gif \ - person.gif \ - list.gif \ - myaddrbk.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/messenger/messengercompose/Makefile.in b/mozilla/themes/blue/messenger/messengercompose/Makefile.in index f4d65ade7fd..5f126d8fa17 100644 --- a/mozilla/themes/blue/messenger/messengercompose/Makefile.in +++ b/mozilla/themes/blue/messenger/messengercompose/Makefile.in @@ -27,27 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin/messengercompose - -EXPORT_RESOURCE_SAMPLES = \ - messengercompose.css \ - send.gif \ - quote.gif \ - address.gif \ - attach.gif \ - spelling.gif \ - save.gif \ - stop.gif \ - sendConvAltering.gif \ - sendConvNo.gif \ - sendConvYes.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/blue/navigator/Makefile.in b/mozilla/themes/blue/navigator/Makefile.in index 5b5482a39b8..906febe19ad 100644 --- a/mozilla/themes/blue/navigator/Makefile.in +++ b/mozilla/themes/blue/navigator/Makefile.in @@ -27,33 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/navigator/skin - -EXPORT_RESOURCE_SAMPLES = \ - alertl.gif \ - back.gif \ - errorl.gif \ - forward.gif \ - home.gif \ - location-hover.gif \ - location.gif \ - messagel.gif \ - mynetscape.gif \ - n-box-persbar.gif \ - navigator.css \ - print.gif \ - questionl.gif \ - reload.gif \ - search.gif \ - stop.gif \ - navigatorBindings.xml \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/Makefile.in b/mozilla/themes/classic/Makefile.in index ad04416536c..d40e19c1a36 100644 --- a/mozilla/themes/classic/Makefile.in +++ b/mozilla/themes/classic/Makefile.in @@ -28,16 +28,13 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -CHROME_DIR = skins/$(THEME) -CHROME_MISC_DIR = . -CHROME_TYPE = skin - -CHROME_MISC = \ - manifest.rdf \ - preview/win/preview.png \ - $(NULL) - DIRS = communicator editor global messenger navigator include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) skin classic/communicator classic.jar; \ + $(REGCHROME) skin classic/editor classic.jar; \ + $(REGCHROME) skin classic/global classic.jar; \ + $(REGCHROME) skin classic/messenger classic.jar; \ + $(REGCHROME) skin classic/navigator classic.jar diff --git a/mozilla/themes/classic/communicator/Makefile.in b/mozilla/themes/classic/communicator/Makefile.in index 2af02347878..366ce48e0e0 100644 --- a/mozilla/themes/classic/communicator/Makefile.in +++ b/mozilla/themes/classic/communicator/Makefile.in @@ -28,29 +28,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -EXPORT_RESOURCE = \ - $(srcdir)/lock.gif \ - $(srcdir)/unlock.gif \ - $(srcdir)/broken.gif \ - $(srcdir)/menubuttonBindings.xml \ - $(srcdir)/offline.gif \ - $(srcdir)/online.gif \ - $(srcdir)/smallheader-bg.gif \ - $(srcdir)/smallheader-bg-pale.gif \ - $(srcdir)/securityOverlay.css \ - $(srcdir)/toolbar-bg.gif \ - $(srcdir)/toolbar-bg.png \ - $(srcdir)/search.gif \ - $(srcdir)/search-active.gif \ - $(srcdir)/search-hover.gif \ - $(srcdir)/content-large.gif \ - $(srcdir)/content-small.gif \ - $(NULL) - DIRS = bookmarks directory profile regviewer related search sidebar win xpinstall include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin - diff --git a/mozilla/themes/classic/communicator/bookmarks/Makefile.in b/mozilla/themes/classic/communicator/bookmarks/Makefile.in index fbbdb36ff8b..a985096314d 100644 --- a/mozilla/themes/classic/communicator/bookmarks/Makefile.in +++ b/mozilla/themes/classic/communicator/bookmarks/Makefile.in @@ -28,30 +28,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/bookmarks - -EXPORT_RESOURCE_SAMPLES = \ - bookmark-folder-closed.gif \ - bookmark-folder-open.gif \ - bookmark-item.gif \ - bookmarks.css \ - home.gif \ - home-hover.gif \ - home-active.gif \ - iefavorite.gif \ - iefolder.gif \ - personal-folder-closed.gif \ - personal-folder-open.gif \ - location.gif \ - location-hover.gif \ - location-clicked.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/communicator/directory/Makefile.in b/mozilla/themes/classic/communicator/directory/Makefile.in index fe1853da435..652a758dd68 100644 --- a/mozilla/themes/classic/communicator/directory/Makefile.in +++ b/mozilla/themes/classic/communicator/directory/Makefile.in @@ -27,23 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/directory - -EXPORT_RESOURCE_SAMPLES = \ - directory.css \ - file-folder-closed-sel.gif \ - file-folder-closed.gif \ - file-folder-open-sel.gif \ - file-folder-open.gif \ - file-icon-sel.gif \ - file-icon.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/communicator/profile/Makefile.in b/mozilla/themes/classic/communicator/profile/Makefile.in index 43787d59491..0b5494f3580 100644 --- a/mozilla/themes/classic/communicator/profile/Makefile.in +++ b/mozilla/themes/classic/communicator/profile/Makefile.in @@ -27,18 +27,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/profile - -EXPORT_RESOURCE_SAMPLES = \ - newProfile1_2.css \ - profile.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/communicator/regviewer/Makefile.in b/mozilla/themes/classic/communicator/regviewer/Makefile.in index 94772ae624d..0b5494f3580 100644 --- a/mozilla/themes/classic/communicator/regviewer/Makefile.in +++ b/mozilla/themes/classic/communicator/regviewer/Makefile.in @@ -27,17 +27,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/regviewer - -EXPORT_RESOURCE_SAMPLES = \ - regviewer.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/communicator/related/Makefile.in b/mozilla/themes/classic/communicator/related/Makefile.in index 2cc8aa9dfff..652a758dd68 100644 --- a/mozilla/themes/classic/communicator/related/Makefile.in +++ b/mozilla/themes/classic/communicator/related/Makefile.in @@ -27,18 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/related - -EXPORT_RESOURCE_SAMPLES = \ - related.css \ - sitemap.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/communicator/search/Makefile.in b/mozilla/themes/classic/communicator/search/Makefile.in index 4a5a5e6562f..e821236f222 100644 --- a/mozilla/themes/classic/communicator/search/Makefile.in +++ b/mozilla/themes/classic/communicator/search/Makefile.in @@ -28,19 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/search - -EXPORT_RESOURCE_SAMPLES = \ - category.gif \ - result.gif \ - $(NULL) - DIRS = win include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/communicator/search/win/Makefile.in b/mozilla/themes/classic/communicator/search/win/Makefile.in index dc65767cae8..4311753a7ee 100644 --- a/mozilla/themes/classic/communicator/search/win/Makefile.in +++ b/mozilla/themes/classic/communicator/search/win/Makefile.in @@ -27,22 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/search/win - -EXPORT_RESOURCE_SAMPLES = \ - findresults.css \ - icons.css \ - internet.css \ - internetresults.css \ - search-editor.css \ - search.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/communicator/sidebar/Makefile.in b/mozilla/themes/classic/communicator/sidebar/Makefile.in index 3c044533d10..1f5ccbb04e5 100644 --- a/mozilla/themes/classic/communicator/sidebar/Makefile.in +++ b/mozilla/themes/classic/communicator/sidebar/Makefile.in @@ -28,22 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/sidebar - -EXPORT_RESOURCE_SAMPLES = \ - sidebarSplitterBindings.xml \ - sidebar-close-hover.gif \ - sidebar-close.gif \ - sidebar-open-hover.gif \ - sidebar-open.gif \ - $(NULL) - DIRS = win include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/communicator/sidebar/unix/Makefile.in b/mozilla/themes/classic/communicator/sidebar/unix/Makefile.in index 4fc8d94c168..4311753a7ee 100644 --- a/mozilla/themes/classic/communicator/sidebar/unix/Makefile.in +++ b/mozilla/themes/classic/communicator/sidebar/unix/Makefile.in @@ -27,19 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/sidebar - -EXPORT_RESOURCE_SAMPLES = \ - customize.css \ - preview.css \ - sidebar.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/communicator/sidebar/win/Makefile.in b/mozilla/themes/classic/communicator/sidebar/win/Makefile.in index 625b9ceed9e..4311753a7ee 100644 --- a/mozilla/themes/classic/communicator/sidebar/win/Makefile.in +++ b/mozilla/themes/classic/communicator/sidebar/win/Makefile.in @@ -27,20 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/sidebar - -EXPORT_RESOURCE_SAMPLES = \ - customize.css \ - preview.css \ - sidebar.css \ - sidebarBindings.xml \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/communicator/unix/Makefile.in b/mozilla/themes/classic/communicator/unix/Makefile.in index 2c3dc3df04d..e1167f0f0da 100644 --- a/mozilla/themes/classic/communicator/unix/Makefile.in +++ b/mozilla/themes/classic/communicator/unix/Makefile.in @@ -27,21 +27,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -EXPORT_RESOURCE = \ - $(srcdir)/box.css \ - $(srcdir)/brand.css \ - $(srcdir)/button.css \ - $(srcdir)/communicator.css \ - $(srcdir)/formatting.css \ - $(srcdir)/menubutton.css \ - $(srcdir)/toolbar.css \ - $(srcdir)/dialogOverlay.css \ - $(srcdir)/tasksOverlay.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin - diff --git a/mozilla/themes/classic/communicator/win/Makefile.in b/mozilla/themes/classic/communicator/win/Makefile.in index 9ca8d980961..5f126d8fa17 100644 --- a/mozilla/themes/classic/communicator/win/Makefile.in +++ b/mozilla/themes/classic/communicator/win/Makefile.in @@ -27,22 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -EXPORT_RESOURCE = \ - $(srcdir)/box.css \ - $(srcdir)/brand.css \ - $(srcdir)/button.css \ - $(srcdir)/communicator.css \ - $(srcdir)/formatting.css \ - $(srcdir)/menubutton.css \ - $(srcdir)/toolbar.css \ - $(srcdir)/dialogOverlay.css \ - $(srcdir)/tasksOverlay.css \ - $(srcdir)/search-widgets.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin - diff --git a/mozilla/themes/classic/communicator/xpinstall/Makefile.in b/mozilla/themes/classic/communicator/xpinstall/Makefile.in index 993d8712b3f..652a758dd68 100644 --- a/mozilla/themes/classic/communicator/xpinstall/Makefile.in +++ b/mozilla/themes/classic/communicator/xpinstall/Makefile.in @@ -27,17 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/xpinstall - -EXPORT_RESOURCE_SAMPLES = \ - xpinstall.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/editor/Makefile.in b/mozilla/themes/classic/editor/Makefile.in index 92653dbf2fa..2595e2c8125 100644 --- a/mozilla/themes/classic/editor/Makefile.in +++ b/mozilla/themes/classic/editor/Makefile.in @@ -28,22 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/editor/skin - -EXPORT_RESOURCE_SAMPLES = \ - EdImageMap.css \ - EdImageMapPage.css \ - EditorDialog.css \ - EditorToolbars.css \ - editor.css \ - $(NULL) - DIRS = images win include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/editor/images/Makefile.in b/mozilla/themes/classic/editor/images/Makefile.in index 0e794c9c2b8..652a758dd68 100644 --- a/mozilla/themes/classic/editor/images/Makefile.in +++ b/mozilla/themes/classic/editor/images/Makefile.in @@ -27,165 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/editor/skin/images - -# split EXPORT_RESOURCE_SAMPLES in two otherwise the generated commands -# can be too long for some systems. -EXPORT_RESOURCE_SAMPLES_1 = \ - Map_Copy.gif \ - Map_Cut.gif \ - Map_Paste.gif \ - Map_checker.gif \ - Map_circleTool.gif \ - Map_contrast.gif \ - Map_pointerTool.gif \ - Map_polygonTool.gif \ - Map_rectangleTool.gif \ - Map_zoomIn.gif \ - Map_zoomOut.gif \ - align-disabled.gif \ - align-hover-active.gif \ - align-hover.gif \ - align.gif \ - anchor-in-doc.gif \ - anchor-white.gif \ - anchor-disabled.gif \ - anchor-hover-active.gif \ - anchor-hover.gif \ - anchor.gif \ - bold-disabled.gif \ - bold-hover-active.gif \ - bold-hover.gif \ - bold.gif \ - bullets-disabled.gif \ - bullets-hover-active.gif \ - bullets-hover.gif \ - bullets.gif \ - center-disabled.gif \ - center-hover-active.gif \ - center-hover.gif \ - center.gif \ - color-disabled.gif \ - color-hover-active.gif \ - color-hover.gif \ - color.gif \ - dec-font-size-disabled.gif \ - dec-font-size-hover-active.gif \ - dec-font-size-hover.gif \ - dec-font-size.gif \ - div.gif \ - find-disabled.gif \ - find-hover-active.gif \ - find-hover.gif \ - find.gif \ - hline-white.gif \ - hline-disabled.gif \ - hline-hover-active.gif \ - hline-hover.gif \ - hline.gif \ - hover-teal.gif \ - image-white.gif \ - image-disabled.gif \ - image-hover-active.gif \ - image-hover.gif \ - image.gif \ - img-align-bottom.gif \ - img-align-left.gif \ - img-align-middle.gif \ - img-align-right.gif \ - img-align-top.gif \ - inc-font-size-disabled.gif \ - inc-font-size-hover-active.gif \ - inc-font-size-hover.gif \ - inc-font-size.gif \ - indent-disabled.gif \ - indent-hover-active.gif \ - indent-hover.gif \ - indent.gif \ - italic-disabled.gif \ - italic-hover-active.gif \ - italic-hover.gif \ - italic.gif \ - justify.gif \ - justify-hover.gif \ - justify-hover-active.gif \ - justify-disabled.gif - -EXPORT_RESOURCE_SAMPLES_2 = \ - left-disabled.gif \ - left-hover-active.gif \ - left-hover.gif \ - left.gif \ - link-white.gif \ - link-disabled.gif \ - link-hover-active.gif \ - link-hover.gif \ - link.gif \ - newfile-disabled.gif \ - newfile-hover-active.gif \ - newfile-hover.gif \ - newfile.gif \ - numbers-disabled.gif \ - numbers-hover-active.gif \ - numbers-hover.gif \ - numbers.gif \ - object-popup.gif \ - openfile-disabled.gif \ - openfile-hover-active.gif \ - openfile-hover.gif \ - openfile.gif \ - outdent-disabled.gif \ - outdent-hover-active.gif \ - outdent-hover.gif \ - outdent.gif \ - preview-disabled.gif \ - preview-hover-active.gif \ - preview-hover.gif \ - preview.gif \ - print-disabled.gif \ - print-hover-active.gif \ - print-hover.gif \ - print.gif \ - publish-disabled.gif \ - publish-hover-active.gif \ - publish-hover.gif \ - publish.gif \ - right-disabled.gif \ - right-hover-active.gif \ - right-hover.gif \ - right.gif \ - savefile-disabled.gif \ - savefile-hover-active.gif \ - savefile-hover.gif \ - savefile.gif \ - savemod.gif \ - span.gif \ - spell-disabled.gif \ - spell-hover-active.gif \ - spell-hover.gif \ - spell.gif \ - table-white.gif \ - table-disabled.gif \ - table-hover-active.gif \ - table-hover.gif \ - table.gif \ - underline-disabled.gif \ - underline-hover-active.gif \ - underline-hover.gif \ - underline.gif \ - editmode-normal.gif \ - editmode-tags.gif \ - editmode-html.gif \ - editmode-preview.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_1)) $(SAMPLES_DIR) - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_2)) $(SAMPLES_DIR) - -distclean clean clobber realclean clobber_all:: - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_1)) - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_2)) diff --git a/mozilla/themes/classic/editor/win/Makefile.in b/mozilla/themes/classic/editor/win/Makefile.in index 3071797289a..0b5494f3580 100644 --- a/mozilla/themes/classic/editor/win/Makefile.in +++ b/mozilla/themes/classic/editor/win/Makefile.in @@ -27,18 +27,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/editor/skin - -EXPORT_RESOURCE_SAMPLES = \ - EditModeTabs.css \ - $(NULL) - - include $(topsrcdir)/config/rules.mk -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/global/Makefile.in b/mozilla/themes/classic/global/Makefile.in index 88e13c4ee48..0d29cc5d2ae 100644 --- a/mozilla/themes/classic/global/Makefile.in +++ b/mozilla/themes/classic/global/Makefile.in @@ -28,123 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/global/skin - -# split EXPORT_RESOURCE_SAMPLES in two otherwise the generated commands -# can be too long for some systems. -EXPORT_RESOURCE_SAMPLES_1 = \ - animthrob.gif \ - animthrob_single.gif \ - blank.gif \ - check-check-disabled.gif \ - check-check.gif \ - check-radio-disabled.gif \ - check-radio.gif \ - columnselect.gif \ - dir-closed.gif \ - dir-open.gif \ - gray-bottomleft.gif \ - gray-bottomright.gif \ - gray-topright.gif \ - grippy-horizontal-after.gif \ - grippy-horizontal-before.gif \ - grippy-vertical-after.gif \ - grippy-vertical-before.gif \ - lessCOls_dis.gif \ - lessCols.gif \ - lessCols_mo.gif \ - menu-arrow-disabled.gif \ - menu-arrow-hover.gif \ - menu-arrow.gif \ - menu-check-disabled.gif \ - menu-check-hover.gif \ - menu-check.gif \ - menu-radio-disabled.gif \ - menu-radio-hover.gif \ - menu-radio.gif \ - moreCols.gif \ - moreCols_dis.gif \ - moreCols_mo.gif \ - print-disabled.gif \ - print-hover-active.gif \ - print-hover.gif \ - print.gif \ - progressmeter-busy.gif \ - return-disabled.gif \ - return.gif \ - arrow-up.gif \ - arrow-down.gif \ - arrow-left.gif \ - arrow-right.gif \ - scroll-down-disabled.gif \ - scroll-down-hover.gif \ - scroll-down.gif \ - scroll-left-disabled.gif \ - scroll-left-hover.gif \ - scroll-left.gif \ - scroll-right-disabled.gif \ - scroll-right-hover.gif \ - scroll-right.gif \ - scroll-up-disabled.gif \ - scroll-up-hover.gif \ - scroll-up.gif \ - search.gif \ - seltab-leftedge.gif \ - seltab-rightedge.gif \ - sortAscending.gif \ - sortDescending.gif \ - stop-disabled.gif \ - stop-hover-active.gif \ - stop-hover.gif \ - stop.gif \ - $(NULL) - -EXPORT_RESOURCE_SAMPLES_2 = \ - tab-leftedge.gif \ - tab-rightedge.gif \ - taskbar-addressbook.gif \ - taskbar-addressbook-hover.gif \ - taskbar-composer.gif \ - taskbar-composer-hover.gif \ - taskbar-mail.gif \ - taskbar-mail-hover.gif \ - taskbar-gotmail.gif \ - taskbar-gotmail-hover.gif \ - taskbar-navigator.gif \ - taskbar-navigator-hover.gif \ - taskbar-popup-arrow.gif \ - taskbar-tab-hover.gif \ - taskbar-tab-minimized.gif \ - taskbar-tab-trans.gif \ - taskbar-tab.gif \ - toolbargrippy-twisty.gif \ - toolbargrippy-texture.gif \ - tbg-twisty-collapsed.gif \ - tbg-texture-collapsed.gif \ - loading.gif \ - splitter-drag-bg.gif \ - dropmarker-down-on-active.gif \ - dropmarker-down-on-hover.gif \ - dropmarker-down-disabled.gif \ - dropmarker-down-on.gif \ - dropmarker-up-on.gif \ - menubuttonBindings.xml \ - twisty-closed-active.gif \ - twisty-closed.gif \ - twisty-closed-selected.gif \ - twisty-open-active.gif \ - twisty-open.gif \ - twisty-open-selected.gif \ - $(NULL) - DIRS = win include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_1)) $(SAMPLES_DIR) - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_2)) $(SAMPLES_DIR) - -distclean clean clobber realclean clobber_all:: - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_1)) - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_2)) diff --git a/mozilla/themes/classic/global/unix/Makefile.in b/mozilla/themes/classic/global/unix/Makefile.in index 54463ab40a5..652a758dd68 100644 --- a/mozilla/themes/classic/global/unix/Makefile.in +++ b/mozilla/themes/classic/global/unix/Makefile.in @@ -27,44 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/global/skin - -EXPORT_RESOURCE_SAMPLES = \ - box.css \ - button.css \ - checkbox.css \ - commonDialog.css \ - console.css \ - filepicker.css \ - formatting.css \ - global.css \ - menu.css \ - menubutton.css \ - menulist.css \ - radio.css \ - scrollbars.css \ - splitter.css \ - tabcontrol.css \ - textfield.css \ - toolbar.css \ - tree.css \ - wizardOverlay.css \ - buttonBindings.xml \ - classicBindings.xml \ - menulistBindings.xml \ - treeBindings.xml \ - scrollbar-slider-bg.gif \ - error-icon.gif \ - message-icon.gif \ - question-icon.gif \ - alert-icon.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/global/win/Makefile.in b/mozilla/themes/classic/global/win/Makefile.in index 63b83a29c22..652a758dd68 100644 --- a/mozilla/themes/classic/global/win/Makefile.in +++ b/mozilla/themes/classic/global/win/Makefile.in @@ -27,46 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/global/skin - -EXPORT_RESOURCE_SAMPLES = \ - box.css \ - button.css \ - checkbox.css \ - commonDialog.css \ - colorpicker.css \ - console.css \ - filepicker.css \ - formatting.css \ - global.css \ - menu.css \ - menubutton.css \ - menulist.css \ - radio.css \ - scrollbars.css \ - splitter.css \ - tabcontrol.css \ - textfield.css \ - toolbar.css \ - tree.css \ - wizardOverlay.css \ - buttonBindings.xml \ - classicBindings.xml \ - menulistBindings.xml \ - tabBindings.xml \ - treeBindings.xml \ - scrollbar-slider-bg.gif \ - error-icon.gif \ - message-icon.gif \ - question-icon.gif \ - alert-icon.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/makefile.win b/mozilla/themes/classic/makefile.win index 4474f9313ef..c3e1956829b 100644 --- a/mozilla/themes/classic/makefile.win +++ b/mozilla/themes/classic/makefile.win @@ -25,9 +25,6 @@ THEME_ROOT_DEPTH = . include <$(DEPTH)\config\config.mak> include <$(THEME_ROOT_DEPTH)\theme.mk> -CHROME_TYPE = skin -CHROME_DIR = skins\$(THEME) - DIRS = communicator\search\win \ communicator\sidebar\win \ communicator\win \ diff --git a/mozilla/themes/classic/messenger/Makefile.in b/mozilla/themes/classic/messenger/Makefile.in index a212f963eb7..e1307a1ada4 100644 --- a/mozilla/themes/classic/messenger/Makefile.in +++ b/mozilla/themes/classic/messenger/Makefile.in @@ -28,139 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin - -# split EXPORT_RESOURCE_SAMPLES in two otherwise the generated commands -# can be too long for some systems. -EXPORT_RESOURCE_SAMPLES_1 = \ - addtoab.gif \ - attach.gif \ - check.gif \ - dot.gif \ - file-disabled.gif \ - file-hover-active.gif \ - file-hover.gif \ - file.gif \ - flagcol.gif \ - flaggedmail.gif \ - folder-closed.gif \ - folder-draft-open.gif \ - folder-draft-share-open.gif \ - folder-draft-share.gif \ - folder-draft.gif \ - folder-filed-open.gif \ - folder-filed.gif \ - folder-hasmail.gif \ - folder-inbox-new.gif \ - folder-inbox-open.gif \ - folder-inbox-share-open.gif \ - folder-inbox-share.gif \ - folder-inbox.gif \ - folder-mailserver.gif \ - folder-new-closed.gif \ - folder-new-open.gif \ - folder-new.gif \ - folder-newsgroup-new.gif \ - folder-newsgroup.gif \ - folder-open.gif \ - folder-outbox-open.gif \ - folder-outbox.gif \ - folder-sent-open.gif \ - folder-sent-share-open.gif \ - folder-sent-share.gif \ - folder-sent.gif \ - folder-server-open.gif \ - folder-server.gif \ - folder-share-open.gif \ - folder-share.gif \ - folder-template-open.gif \ - folder-template-share-open.gif \ - folder-template-share.gif \ - folder-template.gif \ - folder-trash-open.gif \ - folder-trash-share-open.gif \ - folder-trash-share.gif \ - folder-trash.gif \ - forward-disabled.gif \ - forward-hover-active.gif \ - forward-hover.gif \ - forward.gif \ - frown.gif \ - getmsg-disabled.gif \ - getmsg-hover-active.gif \ - getmsg-hover.gif \ - getmsg.gif \ - inbox.gif \ - less.gif \ - local-mailhost.gif - -EXPORT_RESOURCE_SAMPLES_2 = \ - mailfolder.gif \ - mailheader.css \ - message-mail-attach.gif \ - message-mail-imapdelete.gif \ - message-mail-new.gif \ - message-mail.gif \ - message-news-new.gif \ - message-news.gif \ - more.gif \ - newmsg-disabled.gif \ - newmsg-hover-active.gif \ - newmsg-hover.gif \ - newmsg.gif \ - newshost.gif \ - next-disabled.gif \ - next-hover-active.gif \ - next-hover.gif \ - next.gif \ - open-mailfolder.gif \ - outbox.gif \ - readcol.gif \ - readmail.gif \ - reply-disabled.gif \ - reply-hover-active.gif \ - reply-hover.gif \ - reply.gif \ - replyall-disabled.gif \ - replyall-hover-active.gif \ - replyall-hover.gif \ - replyall.gif \ - server-local-new.gif \ - server-local.gif \ - server-mail-new.gif \ - server-mail.gif \ - server-news-lock.gif \ - server-news-new.gif \ - server-news.gif \ - server-remote-lock.gif \ - server-remote.gif \ - sick.gif \ - smile.gif \ - threadcol.gif \ - thread-open.gif \ - thread-closed.gif \ - thread-new-open.gif \ - thread-new-closed.gif \ - trash.gif \ - trash-disabled.gif \ - trash-hover-active.gif \ - trash-hover.gif \ - unreadmail.gif \ - unthreadcol.gif \ - winclassic.gif \ - wink.gif \ - winwide.gif \ - abcard.gif \ - $(NULL) - DIRS = addressbook messengercompose win include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_1)) $(SAMPLES_DIR) - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_2)) $(SAMPLES_DIR) - -distclean clean clobber realclean clobber_all:: - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_1)) - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_2)) diff --git a/mozilla/themes/classic/messenger/addressbook/Makefile.in b/mozilla/themes/classic/messenger/addressbook/Makefile.in index d07ba4f5511..99776980218 100644 --- a/mozilla/themes/classic/messenger/addressbook/Makefile.in +++ b/mozilla/themes/classic/messenger/addressbook/Makefile.in @@ -28,51 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin/addressbook - -EXPORT_RESOURCE_SAMPLES = \ - abnewmsg.gif \ - call-disabled.gif \ - call-hover-active.gif \ - call-hover.gif \ - call.gif \ - edit.gif \ - list.gif \ - myaddrbk.gif \ - newcard-disabled.gif \ - newcard-hover-active.gif \ - newcard-hover.gif \ - newcard.gif \ - newlist-disabled.gif \ - newlist-hover-active.gif \ - newlist-hover.gif \ - newlist.gif \ - newmsgab.gif \ - newmsg-hover-active.gif \ - newmsg-disabled.gif \ - newmsg-hover.gif \ - newmsg.gif \ - person-disabled.gif \ - person-hover-active.gif \ - person-hover.gif \ - person.gif \ - property.gif \ - searchold-disabled.gif \ - searchold-hover-active.gif \ - searchold-hover.gif \ - searchold.gif \ - trash-disabled.gif \ - trash-hover.gif \ - trash.gif \ - trash-hover-active.gif \ - $(NULL) DIRS = win include $(topsrcdir)/config/rules.mk - - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/messenger/addressbook/win/Makefile.in b/mozilla/themes/classic/messenger/addressbook/win/Makefile.in index eddb455cf35..96da18a1694 100644 --- a/mozilla/themes/classic/messenger/addressbook/win/Makefile.in +++ b/mozilla/themes/classic/messenger/addressbook/win/Makefile.in @@ -27,18 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin/addressbook - -EXPORT_RESOURCE_SAMPLES = \ - addressbook.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/messenger/addressbook/win/jar.mn b/mozilla/themes/classic/messenger/addressbook/win/jar.mn index 47a4d68bcfd..a2cafc650bc 100644 --- a/mozilla/themes/classic/messenger/addressbook/win/jar.mn +++ b/mozilla/themes/classic/messenger/addressbook/win/jar.mn @@ -1,2 +1,2 @@ -skins/classic.jar: - messenger/skin/addressbook/addressbook.css (addressbook.css) +classic.jar: + skin/classic/messenger/addressbook/addressbook.css (addressbook.css) diff --git a/mozilla/themes/classic/messenger/messengercompose/Makefile.in b/mozilla/themes/classic/messenger/messengercompose/Makefile.in index 0ceb046c03b..5f126d8fa17 100644 --- a/mozilla/themes/classic/messenger/messengercompose/Makefile.in +++ b/mozilla/themes/classic/messenger/messengercompose/Makefile.in @@ -27,54 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin/messengercompose - -EXPORT_RESOURCE_SAMPLES = \ - address-disabled.gif \ - address-hover-active.gif \ - address-hover.gif \ - address.gif \ - attach-disabled.gif \ - attach-hover-active.gif \ - attach-hover.gif \ - attach.gif \ - attachment.gif \ - mailoptions-disabled.gif \ - mailoptions-hover-active.gif \ - mailoptions-hover.gif \ - mailoptions.gif \ - messengercompose.css \ - quote-disabled.gif \ - quote-hover-active.gif \ - quote-hover.gif \ - quote.gif \ - save.gif \ - savemsg-disabled.gif \ - savemsg-hover-active.gif \ - savemsg-hover.gif \ - savemsg.gif \ - send-disabled.gif \ - send-hover-active.gif \ - send-hover.gif \ - send.gif \ - sendlater-disabled.gif \ - sendlater-hover-active.gif \ - sendlater-hover.gif \ - sendlater.gif \ - spelling-disabled.gif \ - spelling-hover-active.gif \ - spelling-hover.gif \ - spelling.gif \ - stop.gif \ - sendConvAltering.gif \ - sendConvNo.gif \ - sendConvYes.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) diff --git a/mozilla/themes/classic/messenger/win/Makefile.in b/mozilla/themes/classic/messenger/win/Makefile.in index 9bbd3c88cc7..652a758dd68 100644 --- a/mozilla/themes/classic/messenger/win/Makefile.in +++ b/mozilla/themes/classic/messenger/win/Makefile.in @@ -27,22 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin - -EXPORT_RESOURCE_SAMPLES = \ - subscribe.css \ - threadPane.css \ - folderPane.css \ - msgHdrViewOverlay.css \ - pref-mailnews.css \ - messenger.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - -distclean clean clobber realclean clobber_all:: - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) diff --git a/mozilla/themes/classic/messenger/win/jar.mn b/mozilla/themes/classic/messenger/win/jar.mn index 13f8f0ac6aa..0b39cad7809 100644 --- a/mozilla/themes/classic/messenger/win/jar.mn +++ b/mozilla/themes/classic/messenger/win/jar.mn @@ -1,7 +1,7 @@ -skins/classic.jar: - messenger/skin/msgHdrViewOverlay.css - messenger/skin/threadPane.css - messenger/skin/pref-mailnews.css - messenger/skin/folderPane.css - messenger/skin/messenger.css - messenger/skin/subscribe.css +classic.jar: + skin/classic/messenger/msgHdrViewOverlay.css + skin/classic/messenger/threadPane.css + skin/classic/messenger/pref-mailnews.css + skin/classic/messenger/folderPane.css + skin/classic/messenger/messenger.css + skin/classic/messenger/subscribe.css diff --git a/mozilla/themes/classic/navigator/Makefile.in b/mozilla/themes/classic/navigator/Makefile.in index 1be8b8fb7e6..2b49f416065 100644 --- a/mozilla/themes/classic/navigator/Makefile.in +++ b/mozilla/themes/classic/navigator/Makefile.in @@ -28,35 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/navigator/skin - -EXPORT_RESOURCE_SAMPLES = \ - back.gif \ - back-disabled.gif \ - back-hover.gif \ - back-hover-active.gif \ - forward.gif \ - forward-hover.gif \ - forward-hover-active.gif \ - forward-disabled.gif \ - location-hover.gif \ - location.gif \ - reload.gif \ - reload-disabled.gif \ - reload-hover.gif \ - reload-hover-active.gif \ - stop.gif \ - stop-disabled.gif \ - stop-hover.gif \ - stop-hover-active.gif \ - $(NULL) - DIRS = win include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/navigator/mac/jar.mn b/mozilla/themes/classic/navigator/mac/jar.mn index d8510490d6b..eb5acd2c225 100644 --- a/mozilla/themes/classic/navigator/mac/jar.mn +++ b/mozilla/themes/classic/navigator/mac/jar.mn @@ -1,2 +1,2 @@ -skins/classic.jar: +classic.jar: skin/classic/navigator/navigator.css diff --git a/mozilla/themes/classic/navigator/unix/Makefile.in b/mozilla/themes/classic/navigator/unix/Makefile.in index 1b4b0a46207..652a758dd68 100644 --- a/mozilla/themes/classic/navigator/unix/Makefile.in +++ b/mozilla/themes/classic/navigator/unix/Makefile.in @@ -27,18 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/navigator/skin - -EXPORT_RESOURCE_SAMPLES = \ - navigator.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/classic/navigator/win/Makefile.in b/mozilla/themes/classic/navigator/win/Makefile.in index 1b4b0a46207..652a758dd68 100644 --- a/mozilla/themes/classic/navigator/win/Makefile.in +++ b/mozilla/themes/classic/navigator/win/Makefile.in @@ -27,18 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/navigator/skin - -EXPORT_RESOURCE_SAMPLES = \ - navigator.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/Makefile.in b/mozilla/themes/modern/Makefile.in index ab5553d28ed..0ee9aecd572 100644 --- a/mozilla/themes/modern/Makefile.in +++ b/mozilla/themes/modern/Makefile.in @@ -27,17 +27,11 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -CHROME_DIR = skins/$(THEME) -CHROME_MISC_DIR = . -CHROME_TYPE = skin - -CHROME_MISC = \ - manifest.rdf \ - preview.png \ - $(NULL) - -DIRS = communicator global navigator editor messenger - include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) skin modern/communicator modern.jar; \ + $(REGCHROME) skin modern/editor modern.jar; \ + $(REGCHROME) skin modern/global modern.jar; \ + $(REGCHROME) skin modern/messenger modern.jar; \ + $(REGCHROME) skin modern/navigator modern.jar diff --git a/mozilla/themes/modern/communicator/Makefile.in b/mozilla/themes/modern/communicator/Makefile.in index c638214eec0..db74d876c4b 100644 --- a/mozilla/themes/modern/communicator/Makefile.in +++ b/mozilla/themes/modern/communicator/Makefile.in @@ -28,44 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -EXPORT_RESOURCE = \ - $(srcdir)/box.css \ - $(srcdir)/brand.css \ - $(srcdir)/broken.gif \ - $(srcdir)/button.css \ - $(srcdir)/communicator.css \ - $(srcdir)/content-large.gif \ - $(srcdir)/content-small.gif \ - $(srcdir)/dialogOverlay.css \ - $(srcdir)/document-error.gif \ - $(srcdir)/document.gif \ - $(srcdir)/formatting.css \ - $(srcdir)/lock.gif \ - $(srcdir)/menubutton.css \ - $(srcdir)/menubuttonBindings.xml \ - $(srcdir)/navbar-endbox.gif \ - $(srcdir)/offline.gif \ - $(srcdir)/online.gif \ - $(srcdir)/prefpanels.css \ - $(srcdir)/securityOverlay.css \ - $(srcdir)/splitter.css \ - $(srcdir)/tasksOverlay.css \ - $(srcdir)/tb-menubutton-dm-clicked.gif \ - $(srcdir)/tb-menubutton-dm-disabled.gif \ - $(srcdir)/tb-menubutton-dm-hover.gif \ - $(srcdir)/tb-menubutton-dm.gif \ - $(srcdir)/toolbar.css \ - $(srcdir)/unlock.gif \ - $(srcdir)/throbber-groove-bottom.gif \ - $(srcdir)/throbber-groove-left.gif \ - $(srcdir)/throbber-groove-right.gif \ - $(srcdir)/throbber-groove-top.gif \ - $(NULL) - DIRS = search xpinstall sidebar bookmarks directory profile regviewer related include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin - diff --git a/mozilla/themes/modern/communicator/bookmarks/Makefile.in b/mozilla/themes/modern/communicator/bookmarks/Makefile.in index 7361fda1ae8..a985096314d 100644 --- a/mozilla/themes/modern/communicator/bookmarks/Makefile.in +++ b/mozilla/themes/modern/communicator/bookmarks/Makefile.in @@ -28,33 +28,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/bookmarks - -EXPORT_RESOURCE_SAMPLES = \ - bookmark-folder-closed.gif \ - bookmark-folder-closed-sel.gif \ - bookmark-folder-open.gif \ - bookmark-folder-open-sel.gif \ - home.gif \ - home-sel.gif \ - bookmark-item.gif \ - bookmarks.css \ - iefavorite.gif \ - personal-folder-closed.gif \ - personal-folder-closed-sel.gif \ - personal-folder-open.gif \ - personal-folder-open-sel.gif \ - bookmark-folder-closed.png \ - bookmark-folder-open.png \ - bookmark-item.png \ - home.png \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/communicator/directory/Makefile.in b/mozilla/themes/modern/communicator/directory/Makefile.in index 8fdb7ccd8c4..652a758dd68 100644 --- a/mozilla/themes/modern/communicator/directory/Makefile.in +++ b/mozilla/themes/modern/communicator/directory/Makefile.in @@ -27,23 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/directory - -EXPORT_RESOURCE_SAMPLES = \ - directory.css \ - file-folder-closed-sel.gif \ - file-folder-closed.gif \ - file-folder-open-sel.gif \ - file-folder-open.gif \ - file-icon-sel.gif \ - file-icon.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/communicator/profile/Makefile.in b/mozilla/themes/modern/communicator/profile/Makefile.in index 0ef6b365f99..652a758dd68 100644 --- a/mozilla/themes/modern/communicator/profile/Makefile.in +++ b/mozilla/themes/modern/communicator/profile/Makefile.in @@ -27,21 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/profile - -EXPORT_RESOURCE_SAMPLES = \ - newProfile1_2.css \ - profileicon-large.gif \ - profile.css \ - migrate.gif \ - profileManager.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/communicator/regviewer/Makefile.in b/mozilla/themes/modern/communicator/regviewer/Makefile.in index 83768d87d43..0b5494f3580 100644 --- a/mozilla/themes/modern/communicator/regviewer/Makefile.in +++ b/mozilla/themes/modern/communicator/regviewer/Makefile.in @@ -27,17 +27,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/regviewer - -EXPORT_RESOURCE_SAMPLES = \ - regviewer.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/communicator/related/Makefile.in b/mozilla/themes/modern/communicator/related/Makefile.in index 45b8249393e..0b5494f3580 100644 --- a/mozilla/themes/modern/communicator/related/Makefile.in +++ b/mozilla/themes/modern/communicator/related/Makefile.in @@ -27,18 +27,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/related - -EXPORT_RESOURCE_SAMPLES = \ - related.css \ - sitemap.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/communicator/search/Makefile.in b/mozilla/themes/modern/communicator/search/Makefile.in index c72f070008e..652a758dd68 100644 --- a/mozilla/themes/modern/communicator/search/Makefile.in +++ b/mozilla/themes/modern/communicator/search/Makefile.in @@ -27,24 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/search - -EXPORT_RESOURCE_SAMPLES = \ - icons.css \ - result.gif \ - category.gif \ - internet.css \ - search-editor.css \ - findresults.css \ - internetresults.css \ - search.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/communicator/sidebar/Makefile.in b/mozilla/themes/modern/communicator/sidebar/Makefile.in index 937e8cf9cc2..652a758dd68 100644 --- a/mozilla/themes/modern/communicator/sidebar/Makefile.in +++ b/mozilla/themes/modern/communicator/sidebar/Makefile.in @@ -27,45 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/sidebar - -EXPORT_RESOURCE_SAMPLES = \ - list-up-dis.gif \ - sidebar-icon.gif \ - customize.css \ - list-up.gif \ - sidebar-topright-cap.gif \ - list-down-dis.gif \ - preview.css \ - sidebar.css \ - list-down.gif \ - sidebar-bottomright-cap.gif \ - sidebarSplitterBindings.xml \ - sbtab-darkondark-left.gif \ - sbtab-darkondark-right.gif \ - sbtab-darkonlight-left.gif \ - sbtab-darkonlight-right.gif \ - sbtab-lightondark-left.gif \ - sbtab-lightondark-right.gif \ - sbtab-dark.gif \ - sbtab-light.gif \ - sbsplitter-bg.gif \ - sbpicker-arrow.gif \ - sbgrippy-left-hover.gif \ - sbgrippy-left.gif \ - sbgrippy-right-hover.gif \ - sbgrippy-right.gif \ - sidebar-close-hover.gif \ - sidebar-close.gif \ - sidebar-open-hover.gif \ - sidebar-open.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/communicator/xpinstall/Makefile.in b/mozilla/themes/modern/communicator/xpinstall/Makefile.in index 97afddcabfe..652a758dd68 100644 --- a/mozilla/themes/modern/communicator/xpinstall/Makefile.in +++ b/mozilla/themes/modern/communicator/xpinstall/Makefile.in @@ -27,17 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/communicator/skin/xpinstall - -EXPORT_RESOURCE_SAMPLES = \ - xpinstall.css \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/editor/Makefile.in b/mozilla/themes/modern/editor/Makefile.in index f82286e1b8c..e29fa18d243 100644 --- a/mozilla/themes/modern/editor/Makefile.in +++ b/mozilla/themes/modern/editor/Makefile.in @@ -28,22 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/editor/skin - -EXPORT_RESOURCE_SAMPLES = \ - EdImageMapPage.css \ - EditorToolbars.css \ - EdImageMap.css \ - EditorDialog.css \ - editor.css \ - $(NULL) - DIRS = images include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/editor/images/Makefile.in b/mozilla/themes/modern/editor/images/Makefile.in index 77ef5d34f2e..652a758dd68 100644 --- a/mozilla/themes/modern/editor/images/Makefile.in +++ b/mozilla/themes/modern/editor/images/Makefile.in @@ -27,150 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/editor/skin/images - -EXPORT_RESOURCE_SAMPLES = \ - Map_Copy.gif \ - Map_Cut.gif \ - Map_Paste.gif \ - Map_checker.gif \ - Map_circleTool.gif \ - Map_contrast.gif \ - Map_pointerTool.gif \ - Map_polygonTool.gif \ - Map_rectangleTool.gif \ - Map_zoomIn.gif \ - Map_zoomOut.gif \ - align.gif \ - anchor-in-doc.gif \ - anchor-white.gif \ - anchor.gif \ - bold.gif \ - bold_disabled.gif \ - bullets.gif \ - bullets_disabled.gif \ - center.gif \ - center_disabled.gif \ - color.gif \ - dec-font-size.gif \ - dec-font-size_disabled.gif \ - div.gif \ - find.gif \ - hline-white.gif \ - hline.gif \ - hover-teal.gif \ - image-white.gif \ - image.gif \ - img-align-bottom.gif \ - img-align-left.gif \ - img-align-middle.gif \ - img-align-right.gif \ - img-align-top.gif \ - inc-font-size.gif \ - inc-font-size_disabled.gif \ - indent.gif \ - indent_disabled.gif \ - italic.gif \ - italic_disabled.gif \ - justify.gif \ - justify_disabled.gif \ - left.gif \ - left_disabled.gif \ - link-white.gif \ - link.gif \ - newfile.gif \ - numbers.gif \ - numbers_disabled.gif \ - object-popup.gif \ - openfile.gif \ - outdent.gif \ - outdent_disabled.gif \ - preview.gif \ - print.gif \ - publish.gif \ - right.gif \ - right_disabled.gif \ - savefile.gif \ - savemod.gif \ - span.gif \ - spell.gif \ - table-white.gif \ - table.gif \ - underline.gif \ - underline_disabled.gif \ - editmode-normal.gif \ - editmode-tags.gif \ - editmode-html.gif \ - editmode-preview.gif \ - anchor-clicked.gif \ - anchor-disabled.gif \ - anchor-hover.gif \ - hline-disabled.gif \ - hline-hover.gif \ - hline-clicked.gif \ - spell-clicked.gif \ - spell-disabled.gif \ - spell-hover.gif \ - image-disabled.gif \ - image-hover.gif \ - image-clicked.gif \ - link-clicked.gif \ - link-disabled.gif \ - link-hover.gif \ - newfile-disabled.gif \ - newfile-hover.gif \ - newfile-clicked.gif \ - openfile-clicked.gif \ - openfile-disabled.gif \ - openfile-hover.gif \ - preview-clicked.gif \ - preview-disabled.gif \ - preview-hover.gif \ - savefile-disabled.gif \ - savefile-hover.gif \ - table-clicked.gif \ - table-disabled.gif \ - table-hover.gif \ - savefile-clicked.gif \ - align_active.gif \ - align_disabled.gif \ - align_hover.gif \ - bold_active.gif \ - bold_hover.gif \ - bullets_active.gif \ - bullets_hover.gif \ - center_active.gif \ - center_hover.gif \ - dec-font-size_active.gif \ - dec-font-size_hover.gif \ - inc-font-size_active.gif \ - inc-font-size_hover.gif \ - indent_active.gif \ - indent_hover.gif \ - italic_active.gif \ - italic_hover.gif \ - justify_active.gif \ - justify_hover.gif \ - left_active.gif \ - left_hover.gif \ - numbers_active.gif \ - numbers_hover.gif \ - object-popup_active.gif \ - object-popup_disabled.gif \ - object-popup_hover.gif \ - outdent_active.gif \ - outdent_hover.gif \ - right_active.gif \ - right_hover.gif \ - underline_active.gif \ - underline_hover.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/global/Makefile.in b/mozilla/themes/modern/global/Makefile.in index 4344e994d66..906febe19ad 100644 --- a/mozilla/themes/modern/global/Makefile.in +++ b/mozilla/themes/modern/global/Makefile.in @@ -27,294 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/global/skin - -# split EXPORT_RESOURCE_SAMPLES in two otherwise the generated commands -# can be too long for some systems. -EXPORT_RESOURCE_SAMPLES_1 = \ - alert-icon.gif \ - animthrob.gif \ - animthrob_single.gif \ - blank.gif \ - box.css \ - button.css \ - button28-bg-active.gif \ - button28-bg-disabled.gif \ - button28-bg-hover.gif \ - button28-bg.gif \ - button32-bg-active.gif \ - button32-bg-disabled.gif \ - button32-bg-hover.gif \ - button32-bg.gif \ - check-check-disabled.gif \ - check-check.gif \ - check-radio-disabled.gif \ - check-radio.gif \ - checkbox.css \ - closedtwisty-selected.gif \ - closedtwisty.gif \ - columnselect-hover.gif \ - columnselect.gif \ - commonDialog.css \ - colorpicker.css \ - console.css \ - dir-closed.gif \ - dir-open.gif \ - error-icon.gif \ - filepicker.css \ - formatting.css \ - global.css \ - gray-bottomleft.gif \ - gray-bottomright.gif \ - gray-topright.gif \ - grippy-horizontal-after.gif \ - grippy-horizontal-before.gif \ - grippy-vertical-after.gif \ - grippy-vertical-before.gif \ - lessCOls_dis.gif \ - lessCols.gif \ - lessCols_mo.gif \ - mb-single-arrow.gif \ - menu-arrow-disabled.gif \ - menu-arrow-hover.gif \ - menu-arrow.gif \ - menu-check-disabled.gif \ - menu-check-hover.gif \ - menu-check.gif \ - menu-radio-disabled.gif \ - menu-radio-hover.gif \ - menu-radio.gif \ - menu.css \ - menubutton.css \ - menulist.css \ - message-icon.gif \ - moreCols.gif \ - moreCols_dis.gif \ - moreCols_mo.gif \ - button-clicked-left.gif \ - button-clicked-middle.gif \ - button-def-clicked-middle.gif \ - button-def-disabled-left.gif \ - button-def-disabled-mid.gif \ - button-def-disabled-right.gif \ - button-disabled-left.gif \ - button-disabled-middle.gif \ - button-disabled-right.gif \ - button-left.gif \ - button-middle.gif \ - button-right.gif \ - check-cb-check-disabled.gif \ - check-cb-check-pressed.gif \ - check-cb-check.gif \ - check-cb-disabled.gif \ - check-cb-pressed.gif \ - check-cb.gif \ - check-radio-check-disabled.gif \ - check-radio-check-pressed.gif \ - check-radio-check.gif \ - check-radio-focused.gif \ - check-radio-pressed.gif \ - progress-bg.gif \ - progress-filler.gif \ - $(NULL) - -EXPORT_RESOURCE_SAMPLES_2 = \ - arrow-down.gif \ - arrow-left.gif \ - arrow-right.gif \ - arrow-up.gif \ - button-3slice-active-left.gif \ - button-3slice-active-middle.gif \ - button-3slice-active-right.gif \ - button-3slice-normal-left.gif \ - button-3slice-normal-middle.gif \ - button-3slice-normal-right.gif \ - globalBindings.xml \ - loading.gif \ - navbar-bg-leftcap.gif \ - navbar-bg-rightcap.gif \ - scroll-down-disabled.gif \ - scroll-down-hover.gif \ - scroll-down.gif \ - scroll-left-disabled.gif \ - scroll-left-hover.gif \ - scroll-left.gif \ - scroll-right-disabled.gif \ - scroll-right-hover.gif \ - scroll-right.gif \ - scroll-thumb-horiz-disabled.gif \ - scroll-thumb-horiz-hover.gif \ - scroll-thumb-horiz.gif \ - scroll-thumb-vert-disabled.gif \ - scroll-thumb-vert-hover.gif \ - scroll-thumb-vert.gif \ - scroll-up-disabled.gif \ - scroll-up-hover.gif \ - scroll-up.gif \ - scrollbars.css \ - search.gif \ - sortAscending.gif \ - sortDescending.gif \ - grippy-horizontal-after-h.gif \ - grippy-horizontal-after.gif \ - grippy-horizontal-before-h.gif \ - grippy-horizontal-before.gif \ - grippy-vertical-after-h.gif \ - grippy-vertical-after.gif \ - grippy-vertical-before-h.gif \ - grippy-vertical-before.gif \ - splitter-horizontal-bg.gif \ - splitter-vertical-bg.gif \ - splitter.css \ - stop.gif \ - stop-clicked.gif \ - stop-disabled.gif \ - stop-hover.gif \ - tabcontrol.css \ - taskbar-addressbook.gif \ - taskbar-bg-left.gif \ - taskbar-bg-right.gif \ - taskbar-bg.gif \ - taskbar-composer-clicked.gif \ - taskbar-composer.gif \ - taskbar-groove-left.gif \ - taskbar-groove-middle.gif \ - taskbar-groove-right.gif \ - taskbar-mail-clicked.gif \ - taskbar-mail.gif \ - taskbar-mailnew.gif \ - taskbar-navigator.gif \ - taskbar-popup-arrow.gif \ - taskbar-tab-hover.gif \ - taskbar-tab-minimized.gif \ - taskbar-tab-trans.gif \ - taskbar-tab.gif \ - textfield-left-bottom.gif \ - textfield-left-middle.gif \ - textfield-left-top.gif \ - textfield-middle-bottom.gif \ - textfield-middle-top.gif \ - textfield-right-bottom.gif \ - textfield-right-middle.gif \ - textfield-right-top.gif \ - button-def-left.gif \ - button-def-middle.gif \ - button-def-right.gif \ - button-clicked-right.gif \ - button-def-clicked-left.gif \ - button-def-clicked-right.gif \ - scroll-down-clicked.gif \ - scroll-left-clicked.gif \ - scroll-right-clicked.gif \ - scroll-thumb-vert-top.gif \ - $(NULL) - -EXPORT_RESOURCE_SAMPLES_3 = \ - n-box-navbar.gif \ - n-box.gif \ - navbar-bg-begincap.gif \ - navbar-bg.gif \ - navbar-endcap.gif \ - opentwisty-selected.gif \ - opentwisty.gif \ - otherbutton28-bg-active.gif \ - otherbutton28-bg-hover.gif \ - print-clicked.gif \ - print-disabled.gif \ - print-hover.gif \ - print.gif \ - progressmeter-busy.gif \ - question-icon.gif \ - radio.css \ - return-disabled.gif \ - return.gif \ - taskbar-addressbook-clicked.gif \ - taskbar-navigator-clicked.gif \ - tb-grippy-down-clicked.gif \ - tb-grippy-down.gif \ - tb-grippy-up-clicked.gif \ - tb-grippy-up.gif \ - textfield.css \ - toolbar-begincap.gif \ - toolbar-dropdown-hover.gif \ - toolbar-dropdown.gif \ - toolbar-endcap.gif \ - toolbar-menu-arrow-disabled.gif \ - toolbar-menu-arrow-hover.gif \ - toolbar-menu-arrow.gif \ - toolbar.css \ - tree.css \ - wizardOverlay.css \ - menulist-clicked-leftcap.gif \ - menulist-clicked-middle.gif \ - menulist-clicked-rightcap.gif \ - menulist-disabled-leftcap.gif \ - menulist-disabled-middle.gif \ - menulist-disabled-rightcap.gif \ - menulist-leftcap.gif \ - menulist-middle.gif \ - menulist-rightcap.gif \ - scroll-thumb-horz-cl-expand.gif \ - scroll-thumb-horz-cl-grippy.gif \ - scroll-thumb-horz-cl-left.gif \ - scroll-thumb-horz-cl-right.gif \ - scroll-thumb-horz-expand.gif \ - scroll-thumb-horz-grippy.gif \ - scroll-thumb-horz-left.gif \ - scroll-thumb-horz-right.gif \ - scroll-thumb-vert-bottom.gif \ - scroll-thumb-vert-cl-bottom.gif \ - scroll-thumb-vert-cl-expand.gif \ - scroll-thumb-vert-cl-grippy.gif \ - scroll-thumb-vert-cl-top.gif \ - scroll-thumb-vert-expand.gif \ - scroll-thumb-vert-grippy.gif \ - scroll-track-horz-middle.gif \ - scroll-track-vert-middle.gif \ - scroll-up-clicked.gif \ - simple-arrow-down-disabled.gif \ - simple-arrow-down.gif \ - simple-arrow-left-disabled.gif \ - simple-arrow-left.gif \ - simple-arrow-right-disabled.gif \ - simple-arrow-right.gif \ - simple-arrow-up-disabled.gif \ - simple-arrow-up.gif \ - tab-bot-border-leftcap.gif \ - tab-bot-border-rightcap.gif \ - tab-bot-border.gif \ - tab-bot-clicked-left.gif \ - tab-bot-clicked-middle.gif \ - tab-bot-clicked-right.gif \ - tab-bot-select-left.gif \ - tab-bot-select-middle.gif \ - tab-bot-select-right.gif \ - tab-bot-unselect-left.gif \ - tab-bot-unselect-middle.gif \ - tab-bot-unselect-right.gif \ - tab-clicked-left.gif \ - tab-clicked-middle.gif \ - tab-clicked-right.gif \ - tab-select-left.gif \ - tab-select-middle.gif \ - tab-select-right.gif \ - tab-top-border-leftcap.gif \ - tab-top-border-rightcap.gif \ - tab-top-border.gif \ - tab-unselect-left.gif \ - tab-unselect-middle.gif \ - tab-unselect-right.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_1)) $(SAMPLES_DIR) - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_2)) $(SAMPLES_DIR) - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES_3)) $(SAMPLES_DIR) - -distclean clean clobber realclean clobber_all:: - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_1)) - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_2)) - rm -f $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES_3)) diff --git a/mozilla/themes/modern/makefile.win b/mozilla/themes/modern/makefile.win index b52d4740ff5..ee6463074b1 100644 --- a/mozilla/themes/modern/makefile.win +++ b/mozilla/themes/modern/makefile.win @@ -24,10 +24,6 @@ THEME_ROOT_DEPTH = . include <$(DEPTH)\config\config.mak> include <$(THEME_ROOT_DEPTH)\theme.mk> - -CHROME_TYPE = skin -CHROME_DIR = skins\$(THEME) - include <$(DEPTH)\config\rules.mak> chrome:: diff --git a/mozilla/themes/modern/messenger/Makefile.in b/mozilla/themes/modern/messenger/Makefile.in index a84267e71c1..4a7c7e58ba2 100644 --- a/mozilla/themes/modern/messenger/Makefile.in +++ b/mozilla/themes/modern/messenger/Makefile.in @@ -28,142 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin - -EXPORT_RESOURCE_SAMPLES = \ - AccountManager.css \ - addtoab.gif \ - attach.gif \ - check.gif \ - dot.gif \ - fieldMapImport.css \ - file-clicked.gif \ - file-disabled.gif \ - file-hover.gif \ - file.gif \ - flagcol.gif \ - flaggedmail.gif \ - folder-closed.gif \ - folder-draft-open.gif \ - folder-draft-share-open.gif \ - folder-draft-share.gif \ - folder-draft.gif \ - folder-filed-open.gif \ - folder-filed.gif \ - folder-hasmail.gif \ - folder-inbox-new.gif \ - folder-inbox-open.gif \ - folder-inbox-share-open.gif \ - folder-inbox-share.gif \ - folder-inbox.gif \ - folder-mailserver.gif \ - folder-new-closed.gif \ - folder-new-open.gif \ - folder-new.gif \ - folder-newsgroup-new.gif \ - folder-newsgroup.gif \ - folder-open.gif \ - folder-outbox-open.gif \ - folder-outbox.gif \ - folder-sent-open.gif \ - folder-sent-share-open.gif \ - folder-sent-share.gif \ - folder-sent.gif \ - folder-server-open.gif \ - folder-server.gif \ - folder-share-open.gif \ - folder-share.gif \ - folder-template-open.gif \ - folder-template-share-open.gif \ - folder-template-share.gif \ - folder-template.gif \ - folder-trash-open.gif \ - folder-trash-share-open.gif \ - folder-trash-share.gif \ - folder-trash.gif \ - folderPane.css \ - forward-clicked.gif \ - forward-disabled.gif \ - forward-hover.gif \ - forward.gif \ - frown.gif \ - getmsg-clicked.gif \ - getmsg-disabled.gif \ - getmsg-hover.gif \ - getmsg.gif \ - importDialog.css \ - inbox.gif \ - less.gif \ - local-mailhost.gif \ - mailfolder.gif \ - mailheader.css \ - message-mail-attach.gif \ - message-mail-imapdelete.gif \ - message-mail-new.gif \ - message-mail.gif \ - message-news-new.gif \ - message-news.gif \ - messenger.css \ - more.gif \ - msgHdrViewOverlay.css \ - newmsg-clicked.gif \ - newmsg-disabled.gif \ - newmsg-hover.gif \ - newmsg.gif \ - newshost.gif \ - next-clicked.gif \ - next-disabled.gif \ - next-hover.gif \ - next.gif \ - open-mailfolder.gif \ - outbox.gif \ - pref-mailnews.css \ - readcol.gif \ - readmail.gif \ - reply-clicked.gif \ - reply-disabled.gif \ - reply-hover.gif \ - reply.gif \ - replyall-clicked.gif \ - replyall-disabled.gif \ - replyall-hover.gif \ - replyall.gif \ - server-local-new.gif \ - server-local.gif \ - server-mail-new.gif \ - server-mail.gif \ - server-news-lock.gif \ - server-news-new.gif \ - server-news.gif \ - server-remote-lock.gif \ - server-remote.gif \ - sick.gif \ - smile.gif \ - subscribe.css \ - threadPane.css \ - threadcol.gif \ - thread-open.gif \ - thread-closed.gif \ - thread-new-open.gif \ - thread-new-closed.gif \ - trash-clicked.gif \ - trash-disabled.gif \ - trash-hover.gif \ - trash.gif \ - unreadmail.gif \ - unthreadcol.gif \ - winclassic.gif \ - wink.gif \ - winwide.gif \ - wizard.css \ - $(NULL) - DIRS = addressbook messengercompose include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/messenger/addressbook/Makefile.in b/mozilla/themes/modern/messenger/addressbook/Makefile.in index 8d72d0232de..5f126d8fa17 100644 --- a/mozilla/themes/modern/messenger/addressbook/Makefile.in +++ b/mozilla/themes/modern/messenger/addressbook/Makefile.in @@ -27,38 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin/addressbook - -EXPORT_RESOURCE_SAMPLES = \ - addressbook.css \ - newcard.gif \ - newlist.gif \ - edit.gif \ - property.gif \ - abnewmsg.gif \ - newmsgab.gif \ - person.gif \ - list.gif \ - myaddrbk.gif \ - edit-clicked.gif \ - edit-disabled.gif \ - edit-hover.gif \ - newcard-clicked.gif \ - newcard-disabled.gif \ - newcard-hover.gif \ - newlist-clicked.gif \ - newlist-disabled.gif \ - newlist-hover.gif \ - newmsgab-clicked.gif \ - newmsgab-disabled.gif \ - newmsgab-hover.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/messenger/messengercompose/Makefile.in b/mozilla/themes/modern/messenger/messengercompose/Makefile.in index 05acecb5aca..5f126d8fa17 100644 --- a/mozilla/themes/modern/messenger/messengercompose/Makefile.in +++ b/mozilla/themes/modern/messenger/messengercompose/Makefile.in @@ -27,45 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/messenger/skin/messengercompose - -EXPORT_RESOURCE_SAMPLES = \ - messengercompose.css \ - send.gif \ - quote.gif \ - address.gif \ - attach.gif \ - spelling.gif \ - save.gif \ - stop.gif \ - sendConvAltering.gif \ - sendConvNo.gif \ - sendConvYes.gif \ - address-clicked.gif \ - address-disabled.gif \ - address-hover.gif \ - attach-clicked.gif \ - attach-disabled.gif \ - attach-hover.gif \ - quote-clicked.gif \ - quote-disabled.gif \ - quote-hover.gif \ - save-clicked.gif \ - save-disabled.gif \ - save-hover.gif \ - send-clicked.gif \ - send-disabled.gif \ - send-hover.gif \ - spelling-clicked.gif \ - spelling-disabled.gif \ - spelling-hover.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/themes/modern/navigator/Makefile.in b/mozilla/themes/modern/navigator/Makefile.in index b37bf132fe6..906febe19ad 100644 --- a/mozilla/themes/modern/navigator/Makefile.in +++ b/mozilla/themes/modern/navigator/Makefile.in @@ -27,52 +27,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(THEME_ROOT_DEPTH)/theme.mk - -SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/navigator/skin - -EXPORT_RESOURCE_SAMPLES = \ - alertl.gif \ - back-clicked.gif \ - back-disabled.gif \ - back-hover.gif \ - back.gif \ - errorl.gif \ - forward-clicked.gif \ - forward-disabled.gif \ - forward-hover.gif \ - forward.gif \ - home.gif \ - location-hover.gif \ - location.gif \ - messagel.gif \ - mynetscape.gif \ - n-box-persbar.gif \ - navbar-inner-groove-left.gif \ - navbar-inner-groove-middle.gif \ - navbar-inner-groove-right.gif \ - navigator.css \ - print.gif \ - questionl.gif \ - reload-clicked.gif \ - reload-disabled.gif \ - reload-hover.gif \ - reload.gif \ - search.gif \ - stop-clicked.gif \ - stop-disabled.gif \ - stop-hover.gif \ - stop.gif \ - ubhist-keyword-popup-active.gif \ - ubhist-keyword-popup.gif \ - urlbar-left.gif \ - urlbar-middle.gif \ - urlbar-right.gif \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) - -install:: - $(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR) - diff --git a/mozilla/xpcom/base/Makefile.in b/mozilla/xpcom/base/Makefile.in index 599f5d1cb1f..772c538be01 100644 --- a/mozilla/xpcom/base/Makefile.in +++ b/mozilla/xpcom/base/Makefile.in @@ -30,9 +30,6 @@ MODULE = xpcom XPIDL_MODULE = xpcom_base LIBRARY_NAME = xpcombase_s -CHROME_DIR=locales/en-US -CHROME_L10N_DIR=global/locale - CPPSRCS = \ nsAllocator.cpp \ nsMemoryImpl.cpp \ @@ -111,8 +108,3 @@ DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif - -ifndef MOZ_ENABLE_JAR_PACKAGING -install:: - $(INSTALL) -m 444 $(srcdir)/xpcom.properties $(CHROME_DIST)/$(CHROME_L10N_DIR) -endif diff --git a/mozilla/xpfe/browser/Makefile.in b/mozilla/xpfe/browser/Makefile.in index 1495bc3f3a1..ac4673fed9e 100644 --- a/mozilla/xpfe/browser/Makefile.in +++ b/mozilla/xpfe/browser/Makefile.in @@ -30,3 +30,6 @@ DIRS = public src samples resources include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) content navigator comm.jar; \ + $(REGCHROME) locale en-US/navigator en-US.jar diff --git a/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in b/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in index 8c36f8b9387..d08591f03cb 100644 --- a/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in +++ b/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in @@ -28,38 +28,13 @@ include $(DEPTH)/config/autoconf.mk DIRS = unix -CHROME_DIR=locales/en-US -CHROME_L10N_DIR=navigator/locale - -CHROME_L10N = \ - openLocation.dtd \ - openLocation.properties \ - viewSource.dtd \ - pageInfo.dtd \ - NetSupportConfirmCheckYN.dtd \ - navigator.properties \ - askViewZoom.dtd \ - $(NULL) -# navigator.dtd \ - -include $(topsrcdir)/config/rules.mk - -# Apparantly nsinstall created a directory navigator.dtd.out on Puma, temporary fix -GARBAGE += navigator.dtd.out local-jar.mn +GARBAGE += navigator.dtd.out navigator.dtd.out: navigator.dtd $(DEPTH)/config/build_number Makefile Makefile.in cp $(srcdir)/navigator.dtd $@ $(PERL) $(topsrcdir)/config/aboutime.pl $@ $(DEPTH)/config/build_number -local-jar.mn: Makefile Makefile.in - @rm -f $@ - @echo "packages/core.jar:" > $@ - @echo "+ navigator/locale/navigator.dtd (navigator.dtd.out)" >> $@ +chrome:: navigator.dtd.out + +include $(topsrcdir)/config/rules.mk -ifndef MOZ_ENABLE_JAR_PACKAGING -install:: navigator.dtd.out - cp navigator.dtd.out $(CHROME_DIST)/$(CHROME_L10N_DIR)/navigator.dtd -else -install:: navigator.dtd.out local-jar.mn - $(PERL) $(topsrcdir)/config/make-jars-unix.pl -d $(DIST)/bin/chrome < local-jar.mn -endif diff --git a/mozilla/xpfe/communicator/Makefile.in b/mozilla/xpfe/communicator/Makefile.in index d9726bda2a5..85126b56b27 100644 --- a/mozilla/xpfe/communicator/Makefile.in +++ b/mozilla/xpfe/communicator/Makefile.in @@ -30,3 +30,6 @@ DIRS = resources include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) content communicator comm.jar; \ + $(REGCHROME) locale en-US/communicator en-US.jar diff --git a/mozilla/xpfe/communicator/resources/content/Makefile.in b/mozilla/xpfe/communicator/resources/content/Makefile.in index cef13b3692e..b709214187c 100644 --- a/mozilla/xpfe/communicator/resources/content/Makefile.in +++ b/mozilla/xpfe/communicator/resources/content/Makefile.in @@ -26,30 +26,11 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CHROME_DIR=packages/core -CHROME_CONTENT_DIR=communicator/content -CHROME_MISC_DIR=. -CHROME_TYPE=content - -CHROME_MISC = \ - manifest.rdf \ - $(NULL) - -CHROME_CONTENT = \ - builtinURLs.js \ - communicatorOverlay.xul \ - utilityOverlay.xul \ - utilityOverlay.js \ - utilityOverlay.css \ - taskbarOverlay.xul \ - tasksOverlay.js \ - tasksOverlay.xul \ - dialogBindings.xml \ - browserBindings.xul \ - editorBindings.xul \ - $(NULL) - DIRS = unix include $(topsrcdir)/config/rules.mk + +chrome:: + @$(REGCHROME) content communicator comm.jar; \ + $(REGCHROME) locale en-US/communicator en-US.jar diff --git a/mozilla/xpfe/communicator/resources/content/makefile.win b/mozilla/xpfe/communicator/resources/content/makefile.win index 4ef73c66a59..17c2741caf2 100644 --- a/mozilla/xpfe/communicator/resources/content/makefile.win +++ b/mozilla/xpfe/communicator/resources/content/makefile.win @@ -21,31 +21,8 @@ DEPTH=..\..\..\.. -CHROME_DIR=packages\core -CHROME_CONTENT_DIR=communicator\content -CHROME_MISC_DIR=. -CHROME_TYPE=content - DIRS= win -CHROME_MISC = \ - .\manifest.rdf \ - $(NULL) - -CHROME_CONTENT = \ - .\builtinURLs.js \ - .\communicatorOverlay.xul \ - .\utilityOverlay.xul \ - .\utilityOverlay.js \ - .\utilityOverlay.css \ - .\taskbarOverlay.xul \ - .\tasksOverlay.js \ - .\tasksOverlay.xul \ - .\dialogBindings.xml \ - .\browserBindings.xul \ - .\editorBindings.xul \ - $(NULL) - include <$(DEPTH)\config\rules.mak> chrome:: diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in b/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in index c27d096dc06..8fbf8382b55 100644 --- a/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in +++ b/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in @@ -26,22 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CHROME_DIR=locales/en-US -CHROME_MISC_DIR=. -CHROME_L10N_DIR=communicator/locale -CHROME_TYPE=locale - -CHROME_MISC = \ - manifest.rdf \ - $(NULL) - -CHROME_L10N = \ - utilityOverlay.dtd \ - utilityOverlay.properties \ - taskbar.rdf \ - taskbarOverlay.dtd \ - tasksOverlay.dtd \ - $(NULL) - include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) content communicator comm.jar; \ + $(REGCHROME) locale en-US/communicator en-US.jar + diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/makefile.win b/mozilla/xpfe/communicator/resources/locale/en-US/makefile.win index cf6de10d242..77db3ede49f 100644 --- a/mozilla/xpfe/communicator/resources/locale/en-US/makefile.win +++ b/mozilla/xpfe/communicator/resources/locale/en-US/makefile.win @@ -21,23 +21,6 @@ DEPTH=..\..\..\..\.. -CHROME_DIR=locales\en-US -CHROME_MISC_DIR=. -CHROME_L10N_DIR=communicator\locale -CHROME_TYPE=locale - -CHROME_MISC = \ - .\manifest.rdf \ - $(NULL) - -CHROME_L10N = \ - .\utilityOverlay.dtd \ - .\utilityOverlay.properties \ - .\taskbar.rdf \ - .\tasksOverlay.dtd \ - .\taskbarOverlay.dtd \ - $(NULL) - include <$(DEPTH)\config\rules.mak> chrome:: diff --git a/mozilla/xpfe/components/autocomplete/resources/content/Makefile.in b/mozilla/xpfe/components/autocomplete/resources/content/Makefile.in index 36137bfb50e..48b5bf749fd 100644 --- a/mozilla/xpfe/components/autocomplete/resources/content/Makefile.in +++ b/mozilla/xpfe/components/autocomplete/resources/content/Makefile.in @@ -26,10 +26,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_CHROME = $(srcdir)/autocomplete.xml \ - $(NULL) - include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(EXPORT_CHROME) $(DIST)/bin/chrome/packages/widget-toolkit/global/content diff --git a/mozilla/xpfe/global/Makefile.in b/mozilla/xpfe/global/Makefile.in index d9726bda2a5..abcde2427bf 100644 --- a/mozilla/xpfe/global/Makefile.in +++ b/mozilla/xpfe/global/Makefile.in @@ -30,3 +30,6 @@ DIRS = resources include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) content global toolkit.jar; \ + $(REGCHROME) locale en-US/global en-US.jar diff --git a/mozilla/xpfe/global/resources/content/Makefile.in b/mozilla/xpfe/global/resources/content/Makefile.in index e1cdd367fe1..6216833f342 100644 --- a/mozilla/xpfe/global/resources/content/Makefile.in +++ b/mozilla/xpfe/global/resources/content/Makefile.in @@ -32,59 +32,8 @@ else DIRS = unix endif -CHROME_DIR=packages/widget-toolkit -CHROME_CONTENT_DIR=global/content -CHROME_MISC_DIR=. -CHROME_TYPE=content - -CHROME_MISC= \ - manifest.rdf \ - $(NULL) - -CHROME_CONTENT= \ - manifest.rdf \ - hiddenWindow.xul \ - globalOverlay.xul \ - globalOverlay.js \ - dialogOverlay.xul \ - dialogOverlay.js \ - commonDialog.xul \ - commonDialog.js \ - charsetOverlay.xul \ - charsetOverlay.js \ - strres.js \ - logo.gif \ - about.xul \ - credits.html \ - mozilla.html \ - charsetDetectorsOverlay.js \ - charsetDetectorsOverlay.xul \ - selectDialog.js \ - selectDialog.xul \ - nsWidgetStateManager.js \ - widgetStateManager.js \ - wizardHandlerSet.js \ - wizardManager.js \ - wizardOverlay.js \ - wizardOverlay.xul \ - treePopups.js \ - htmlBindings.xml \ - menulistBindings.xml \ - radioBindings.xml \ - scrollbarBindings.xml \ - tabBindings.xml \ - treeBindings.xml \ - xulBindings.xml \ - nsClipboard.js \ - nsDragAndDrop.js \ - nsJSSupportsUtils.js \ - nsTransferable.js \ - nsJSComponentManager.js\ - nsUserSettings.js \ - xul.css \ - toolbarBindings.xml \ - stringbundleBindings.xml \ - $(NULL) - include $(topsrcdir)/config/rules.mk +chrome:: + @$(REGCHROME) content global toolkit.jar; \ + $(REGCHROME) locale en-US/global en-US.jar diff --git a/mozilla/xpfe/global/resources/content/makefile.win b/mozilla/xpfe/global/resources/content/makefile.win index 450e9a28feb..04c750583d9 100644 --- a/mozilla/xpfe/global/resources/content/makefile.win +++ b/mozilla/xpfe/global/resources/content/makefile.win @@ -24,59 +24,6 @@ DEPTH=..\..\..\.. DIRS=win -CHROME_DIR=packages\widget-toolkit -CHROME_CONTENT_DIR=global\content -CHROME_MISC_DIR=. -CHROME_TYPE=content - -CHROME_MISC= \ - .\manifest.rdf \ - $(NULL) - -CHROME_CONTENT= \ - .\hiddenWindow.xul \ - .\globalOverlay.xul \ - .\globalOverlay.js \ - .\dialogOverlay.xul \ - .\dialogOverlay.js \ - .\commonDialog.xul \ - .\commonDialog.js \ - .\strres.js \ - .\logo.gif \ - .\about.xul \ - .\mozilla.html \ - .\credits.html \ - .\charsetOverlay.xul \ - .\charsetOverlay.js \ - .\charsetDetectorsOverlay.js \ - .\charsetDetectorsOverlay.xul \ - .\selectDialog.js \ - .\selectDialog.xul \ - .\nsWidgetStateManager.js \ - .\widgetStateManager.js \ - .\wizardHandlerSet.js \ - .\wizardManager.js \ - .\wizardOverlay.js \ - .\wizardOverlay.xul \ - .\treePopups.js \ - .\xulBindings.xml \ - .\htmlBindings.xml \ - .\menulistBindings.xml \ - .\radioBindings.xml \ - .\scrollbarBindings.xml \ - .\tabBindings.xml \ - .\treeBindings.xml \ - .\toolbarBindings.xml \ - .\nsClipboard.js \ - .\nsDragAndDrop.js \ - .\nsJSSupportsUtils.js \ - .\nsTransferable.js \ - .\nsJSComponentManager.js \ - .\nsUserSettings.js \ - .\xul.css \ - .\stringbundleBindings.xml \ - $(NULL) - include <$(DEPTH)\config\rules.mak> chrome:: diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix index cfa8eee3843..af5ad3d60a0 100644 --- a/mozilla/xpinstall/packager/packages-unix +++ b/mozilla/xpinstall/packager/packages-unix @@ -12,7 +12,7 @@ ; ; en-US bin/defaults/profile/en-US/* -bin/chrome/locales/en-US/* +bin/chrome/en-US.jar bin/searchplugins/* [deflenus] @@ -187,19 +187,21 @@ bin/components/xml-rpc.xpt bin/components/nsDictionary.js bin/components/nsXmlRpcClient.js -bin/chrome/packages/widget-toolkit/* -bin/chrome/packages/core/* -bin/chrome/skins/* --bin/chrome/packages/core/editor/content/EditorInitPage.html --bin/chrome/packages/core/editor/content/EditorInitPagePlain.html +bin/chrome/toolkit.jar +bin/chrome/comm.jar +bin/chrome/modern.jar +bin/chrome/classic.jar +bin/chrome/blue.jar +;-bin/chrome/comm/content/editor/EditorInitPage.html +;-bin/chrome/comm/content/editor/content/EditorInitPagePlain.html ;Include this for "debug" testing - remove for actual beta release: -;-bin/chrome/packages/core/editor/content/TextEditorAppShell.xul --bin/chrome/packages/core/editor/content/sb-bookmarks-panel.xul --bin/chrome/packages/core/editor/content/sb-bookmarks.js --bin/chrome/packages/core/editor/content/sb-file-contextMenu.js --bin/chrome/packages/core/editor/content/sb-file-panel.js --bin/chrome/packages/core/editor/content/sb-file-panel.xul --bin/chrome/packages/core/editor/content/sb-FileWidgetFileHandler.js +;-bin/chrome/comm/content/editor/content/TextEditorAppShell.xul +;-bin/chrome/comm/content/editor/content/sb-bookmarks-panel.xul +;-bin/chrome/comm/content/editor/content/sb-bookmarks.js +;-bin/chrome/comm/content/editor/content/sb-file-contextMenu.js +;-bin/chrome/comm/content/editor/content/sb-file-panel.js +;-bin/chrome/comm/content/editor/content/sb-file-panel.xul +;-bin/chrome/comm/content/editor/content/sb-FileWidgetFileHandler.js ; all the pref files must be part of base ; to prevent migration bugs @@ -261,12 +263,12 @@ bin/components/msgsearch.xpt bin/components/txmgr.xpt bin/components/import.xpt bin/components/absync.xpt -bin/chrome/packages/messenger/* +bin/chrome/messenger.jar [chatzilla] bin/components/chatzilla-service.js -bin/chrome/packages/chatzilla/* +bin/chrome/chatzilla/* [talkback] diff --git a/mozilla/xpinstall/packager/unix/browser.jst b/mozilla/xpinstall/packager/unix/browser.jst index 153c92c17ac..eaed0170e97 100644 --- a/mozilla/xpinstall/packager/unix/browser.jst +++ b/mozilla/xpinstall/packager/unix/browser.jst @@ -22,12 +22,26 @@ if (verifyDiskSpace(communicatorFolder, srDest)) var ignoreErr = dirCreate(pluginsFolder); logComment("dirCreate() returned: " + ignoreErr); - var ctype = (CONTENT | DELAYED_CHROME); var cf = getFolder("Chrome"); - registerChrome(ctype, getFolder(cf,"packages/core")); - registerChrome(ctype, getFolder(cf,"packages/widget-toolkit")); - registerChrome(SKIN|DELAYED_CHROME, getFolder(cf,"skins/classic")); - registerChrome(SKIN|DELAYED_CHROME, getFolder(cf,"skins/modern")); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/editor/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/communicator/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/editor/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/global/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/messenger/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"classic.jar"),"skin/classic/navigator/"); +// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/communicator/"); +// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/editor/"); +// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/global/"); +// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/messenger/"); +// registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"blue.jar"),"skin/blue/navigator/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/communicator/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/editor/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/global/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/messenger/"); + registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/navigator/"); if (err==SUCCESS) { diff --git a/mozilla/xpinstall/packager/unix/chatzilla.jst b/mozilla/xpinstall/packager/unix/chatzilla.jst index 49ea2c96c7f..75c837889cf 100644 --- a/mozilla/xpinstall/packager/unix/chatzilla.jst +++ b/mozilla/xpinstall/packager/unix/chatzilla.jst @@ -12,13 +12,12 @@ if (verifyDiskSpace(getFolder("Program"), srDest)) "chatzilla-service.js", true); - var fChat = getFolder("Chrome","packages/chatzilla"); - addDirectory("", - "bin/chrome/packages/chatzilla", // jar source folder - fChat, // target folder - ""); // target subdir + addFile("Chatzilla Chrome", + "bin/chrome/chatzilla.jar", // jar source folder + getFolder("Chrome"), // target folder + ""); // target subdir - registerChrome(PACKAGE | DELAYED_CHROME, fChat); + registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome","chatzilla.jar")); if (err==SUCCESS) performInstall(); diff --git a/mozilla/xpinstall/packager/unix/langende.jst b/mozilla/xpinstall/packager/unix/langende.jst index ce43c42be73..297a068191a 100644 --- a/mozilla/xpinstall/packager/unix/langende.jst +++ b/mozilla/xpinstall/packager/unix/langende.jst @@ -5,7 +5,7 @@ var fProgram; // --- LOCALIZATION NOTE: translate only these --- var prettyName = "English-German Language Pack"; var regName = "locales/mozilla/en-DE"; -var chromeName = "locales/en-DE"; +var chromeName = "en-DE.jar"; // --- END LOCALIZABLE RESOURCES --- err = initInstall(prettyName, regName, "$Version$"); diff --git a/mozilla/xpinstall/packager/unix/langengb.jst b/mozilla/xpinstall/packager/unix/langengb.jst index 8b8cb85e698..d787c925368 100644 --- a/mozilla/xpinstall/packager/unix/langengb.jst +++ b/mozilla/xpinstall/packager/unix/langengb.jst @@ -5,7 +5,7 @@ var fProgram; // --- LOCALIZATION NOTE: translate only these --- var prettyName = "English-GB Language Pack"; var regName = "locales/mozilla/en-GB"; -var chromeName = "locales/en-GB"; +var chromeName = "en-GB.jar"; // --- END LOCALIZABLE RESOURCES --- err = initInstall(prettyName, regName, "$Version$"); diff --git a/mozilla/xpinstall/packager/unix/langenus.jst b/mozilla/xpinstall/packager/unix/langenus.jst index 87e3cd13269..52dedc894c0 100644 --- a/mozilla/xpinstall/packager/unix/langenus.jst +++ b/mozilla/xpinstall/packager/unix/langenus.jst @@ -5,7 +5,7 @@ var fProgram; // --- LOCALIZATION NOTE: translate only these --- var prettyName = "English-US Language Pack"; var regName = "locales/mozilla/en-US"; -var chromeName = "locales/en-US"; +var chromeName = "en-US.jar"; // --- END LOCALIZABLE RESOURCES --- err = initInstall(prettyName, regName, "$Version$"); @@ -26,7 +26,11 @@ if (verifyDiskSpace(fProgram, srDest)) // register chrome var cf = getFolder("Chrome"); - registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName)); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/global/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/communicator/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/messenger/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/editor/"); + registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/en-US/navigator/"); if (err == SUCCESS) { diff --git a/mozilla/xpinstall/packager/unix/mail.jst b/mozilla/xpinstall/packager/unix/mail.jst index 38297c9415e..de00e871e93 100644 --- a/mozilla/xpinstall/packager/unix/mail.jst +++ b/mozilla/xpinstall/packager/unix/mail.jst @@ -18,7 +18,8 @@ if (verifyDiskSpace(communicatorFolder, srDest)) logComment("addDirectory() returned: " + err); registerChrome(CONTENT | DELAYED_CHROME, - getFolder("Chrome","packages/messenger")); + getFolder("Chrome","messenger.jar"), + "content/messenger/"); if (err==SUCCESS) { diff --git a/mozilla/xpinstall/packager/windows/langende.jst b/mozilla/xpinstall/packager/windows/langende.jst index 2863a3fb4e2..69f337f237d 100644 --- a/mozilla/xpinstall/packager/windows/langende.jst +++ b/mozilla/xpinstall/packager/windows/langende.jst @@ -6,7 +6,7 @@ var fProgram; // ----LOCALIZATION NOTE: translate only these ------ var prettyName = "English-German Language Pack"; var regName = "locales/mozilla/en-DE"; -var chromeName = "en-DE.loc"; +var chromeName = "en-DE.jar"; // --- END CHANGABLE STUFF --- srDest = $SpaceRequired$:bin; diff --git a/mozilla/xpinstall/packager/windows/langengb.jst b/mozilla/xpinstall/packager/windows/langengb.jst index 509d17245f3..d6e90a9b8b1 100644 --- a/mozilla/xpinstall/packager/windows/langengb.jst +++ b/mozilla/xpinstall/packager/windows/langengb.jst @@ -6,7 +6,7 @@ var fProgram; // ----LOCALIZATION NOTE: translate only these ------ var prettyName = "English-GB Language Pack"; var regName = "locales/mozilla/en-GB"; -var chromeName = "en-GB.loc"; +var chromeName = "en-GB.jar"; // --- END CHANGABLE STUFF --- srDest = $SpaceRequired$:bin;