diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh index eeb1e5caf38..751444defd0 100755 --- a/mozilla/allmakefiles.sh +++ b/mozilla/allmakefiles.sh @@ -415,16 +415,10 @@ profile/Makefile profile/src/Makefile profile/public/Makefile profile/resources/Makefile -profile/resources/content/Makefile -profile/resources/locale/Makefile -profile/resources/locale/en-US/Makefile profile/pref-migrator/Makefile profile/pref-migrator/public/Makefile profile/pref-migrator/src/Makefile profile/pref-migrator/resources/Makefile -profile/pref-migrator/resources/content/Makefile -profile/pref-migrator/resources/locale/Makefile -profile/pref-migrator/resources/locale/en-US/Makefile profile/defaults/Makefile " @@ -584,9 +578,6 @@ xpinstall/Makefile xpinstall/packager/Makefile xpinstall/public/Makefile xpinstall/res/Makefile -xpinstall/res/content/Makefile -xpinstall/res/locale/Makefile -xpinstall/res/locale/en-US/Makefile xpinstall/src/Makefile xpinstall/stub/Makefile xpinstall/wizard/unix/src2/Makefile @@ -611,29 +602,18 @@ xpfe/components/shistory/src/Makefile xpfe/components/bookmarks/Makefile xpfe/components/bookmarks/public/Makefile xpfe/components/bookmarks/src/Makefile -xpfe/components/bookmarks/resources/Makefile xpfe/components/directory/Makefile xpfe/components/timebomb/Makefile xpfe/components/timebomb/tools/Makefile -xpfe/components/timebomb/resources/Makefile -xpfe/components/timebomb/resources/content/Makefile -xpfe/components/timebomb/resources/locale/Makefile -xpfe/components/timebomb/resources/locale/en-US/Makefile xpfe/components/regviewer/Makefile xpfe/components/find/Makefile xpfe/components/find/public/Makefile xpfe/components/find/src/Makefile -xpfe/components/find/resources/Makefile xpfe/components/filepicker/src/Makefile -xpfe/components/filepicker/res/content/Makefile -xpfe/components/filepicker/res/locale/Makefile -xpfe/components/filepicker/res/locale/en-US/Makefile -xpfe/components/filepicker/res/Makefile xpfe/components/filepicker/Makefile xpfe/components/history/Makefile xpfe/components/history/src/Makefile xpfe/components/history/public/Makefile -xpfe/components/history/resources/Makefile xpfe/components/prefwindow/Makefile xpfe/components/prefwindow/resources/Makefile xpfe/components/prefwindow/resources/content/Makefile @@ -644,37 +624,26 @@ xpfe/components/prefwindow/resources/locale/en-US/unix/Makefile xpfe/components/related/Makefile xpfe/components/related/src/Makefile xpfe/components/related/public/Makefile -xpfe/components/related/resources/Makefile xpfe/components/search/Makefile xpfe/components/search/datasets/Makefile -xpfe/components/search/resources/Makefile xpfe/components/search/public/Makefile xpfe/components/search/src/Makefile xpfe/components/sidebar/Makefile xpfe/components/sidebar/public/Makefile -xpfe/components/sidebar/resources/Makefile xpfe/components/sidebar/src/Makefile xpfe/components/xfer/Makefile xpfe/components/xfer/public/Makefile xpfe/components/xfer/src/Makefile -xpfe/components/xfer/resources/Makefile xpfe/components/ucth/Makefile xpfe/components/ucth/public/Makefile xpfe/components/ucth/src/Makefile -xpfe/components/ucth/resources/Makefile xpfe/components/remote/Makefile xpfe/components/remote/public/Makefile xpfe/components/remote/src/Makefile xpfe/components/autocomplete/Makefile xpfe/components/autocomplete/public/Makefile -xpfe/components/autocomplete/resources/Makefile -xpfe/components/autocomplete/resources/content/Makefile xpfe/components/autocomplete/src/Makefile xpfe/components/console/Makefile -xpfe/components/console/resources/Makefile -xpfe/components/console/resources/content/Makefile -xpfe/components/console/resources/locale/Makefile -xpfe/components/console/resources/locale/en-US/Makefile xpfe/appshell/Makefile xpfe/appshell/src/Makefile xpfe/appshell/public/Makefile @@ -885,9 +854,6 @@ for extension in $MOZ_EXTENSIONS; do irc ) MAKEFILES_extensions="$MAKEFILES_extensions extensions/irc/Makefile extensions/irc/xul/Makefile - extensions/irc/xul/content/Makefile - extensions/irc/xul/locale/Makefile - extensions/irc/xul/locale/en-US/Makefile " ;; transformiix ) MAKEFILES_extensions="$MAKEFILES_extensions $MAKEFILES_transformiix" diff --git a/mozilla/extensions/cview/resources/Makefile.in b/mozilla/extensions/cview/resources/Makefile.in index 9c1c5c3ecb3..9be94ef136f 100644 --- a/mozilla/extensions/cview/resources/Makefile.in +++ b/mozilla/extensions/cview/resources/Makefile.in @@ -28,8 +28,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = content locale skin - include $(topsrcdir)/config/rules.mk chrome:: diff --git a/mozilla/extensions/irc/Makefile.in b/mozilla/extensions/irc/Makefile.in index 20ec5f29a2c..cb675d873b1 100644 --- a/mozilla/extensions/irc/Makefile.in +++ b/mozilla/extensions/irc/Makefile.in @@ -34,8 +34,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = xul - include $(topsrcdir)/config/rules.mk install:: diff --git a/mozilla/mailnews/absync/Makefile.in b/mozilla/mailnews/absync/Makefile.in index 363980a3eb8..4b3b329cfc7 100644 --- a/mozilla/mailnews/absync/Makefile.in +++ b/mozilla/mailnews/absync/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src build resources +DIRS = public src build include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/addrbook/Makefile.in b/mozilla/mailnews/addrbook/Makefile.in index ea5cc3835f5..4b3b329cfc7 100644 --- a/mozilla/mailnews/addrbook/Makefile.in +++ b/mozilla/mailnews/addrbook/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src prefs build resources +DIRS = public src build include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/Makefile.in b/mozilla/mailnews/base/Makefile.in index 1b32e2adad8..85aabe1bffd 100644 --- a/mozilla/mailnews/base/Makefile.in +++ b/mozilla/mailnews/base/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src util search prefs build resources +DIRS = public src util search build resources ifdef ENABLE_TESTS DIRS += tests diff --git a/mozilla/mailnews/base/resources/Makefile.in b/mozilla/mailnews/base/resources/Makefile.in index d95b9ed9909..aa9511960be 100644 --- a/mozilla/mailnews/base/resources/Makefile.in +++ b/mozilla/mailnews/base/resources/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = content locale +DIRS = content include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/resources/content/Makefile.in b/mozilla/mailnews/base/resources/content/Makefile.in index 9541654bd24..532c75dbc76 100644 --- a/mozilla/mailnews/base/resources/content/Makefile.in +++ b/mozilla/mailnews/base/resources/content/Makefile.in @@ -28,65 +28,5 @@ include $(DEPTH)/config/autoconf.mk DIRS = unix -CHROME_DIR=packages/messenger -CHROME_CONTENT_DIR=messenger/content -CHROME_MISC_DIR=. -CHROME_TYPE=content - -CHROME_MISC = \ - manifest.rdf \ - $(NULL) - -CHROME_CONTENT = \ - messenger.xul \ - mail3PaneWindowVertLayout.xul \ - mailWindowOverlay.xul \ - mailWindowOverlay.js \ - mailWindow.js \ - messageWindow.xul \ - messageWindow.js \ - folderPane.xul \ - threadPane.xul \ - threadPane.js \ - msgHdrViewOverlay.xul \ - msgHdrViewOverlay.js \ - msgHdrViewAddresses.js \ - widgetglue.js \ - commandglue.js \ - mailCommands.js \ - shareglue.js \ - subscribe.js \ - subscribe.xul \ - sidebar-messenger.rdf \ - imapFolderProps.xul \ - folderProps.js \ - newFolderNameDialog.xul \ - newFolderNameDialog.js \ - msgViewNavigation.js \ - msgMail3PaneWindow.js \ - mail3PaneWindowCommands.js \ - msgFolderPickerOverlay.js \ - msgFolderPickerOverlay.xul \ - renameFolderNameDialog.xul \ - messengerdnd.js \ - mailContextMenus.js \ - msgPrintEngine.js \ - msgPrintEngine.xul \ - popTest.js \ - popTest.xul \ - imapTest.xul \ - imapTest.js \ - openSaveAttachment.xul \ - openSaveAttachment.js \ - mailTasksOverlay.xul \ - mailNavigatorOverlay.xul \ - mailEditorOverlay.xul \ - mailABOverlay.xul \ - mailMessengerOverlay.xul \ - mailMessengerComposeOverlay.xul \ - mailOverlay.xul \ - mailWidgets.xml \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/search/Makefile.in b/mozilla/mailnews/base/search/Makefile.in index 41f65005292..c6b017c91f8 100644 --- a/mozilla/mailnews/base/search/Makefile.in +++ b/mozilla/mailnews/base/search/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src resources +DIRS = public src #ifdef ENABLE_TESTS #DIRS += tests diff --git a/mozilla/mailnews/compose/Makefile.in b/mozilla/mailnews/compose/Makefile.in index 5816deabc38..703a2c1ffb2 100644 --- a/mozilla/mailnews/compose/Makefile.in +++ b/mozilla/mailnews/compose/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src prefs build resources +DIRS = public src build ifdef ENABLE_TESTS DIRS += tests diff --git a/mozilla/mailnews/imap/Makefile.in b/mozilla/mailnews/imap/Makefile.in index 13d91cc702e..703a2c1ffb2 100644 --- a/mozilla/mailnews/imap/Makefile.in +++ b/mozilla/mailnews/imap/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src resources build +DIRS = public src build ifdef ENABLE_TESTS DIRS += tests diff --git a/mozilla/mailnews/import/Makefile.in b/mozilla/mailnews/import/Makefile.in index 2ebfcc8d902..8eedaa99e42 100644 --- a/mozilla/mailnews/import/Makefile.in +++ b/mozilla/mailnews/import/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public resources src text +DIRS = public src text include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/import/text/Makefile.in b/mozilla/mailnews/import/text/Makefile.in index 517afbf585a..0b4d2a90ab5 100644 --- a/mozilla/mailnews/import/text/Makefile.in +++ b/mozilla/mailnews/import/text/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = resources src +DIRS = src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/local/Makefile.in b/mozilla/mailnews/local/Makefile.in index f39fe54089e..703a2c1ffb2 100644 --- a/mozilla/mailnews/local/Makefile.in +++ b/mozilla/mailnews/local/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src build resources +DIRS = public src build ifdef ENABLE_TESTS DIRS += tests diff --git a/mozilla/mailnews/makefiles b/mozilla/mailnews/makefiles index 7e96390c62b..bcf257ca418 100644 --- a/mozilla/mailnews/makefiles +++ b/mozilla/mailnews/makefiles @@ -2,23 +2,11 @@ mailnews/Makefile mailnews/absync/build/Makefile mailnews/absync/Makefile mailnews/absync/public/Makefile -mailnews/absync/resources/locale/en-US/Makefile -mailnews/absync/resources/locale/Makefile -mailnews/absync/resources/Makefile mailnews/absync/src/Makefile mailnews/addrbook/Makefile mailnews/addrbook/build/Makefile mailnews/addrbook/public/Makefile mailnews/addrbook/src/Makefile -mailnews/addrbook/resources/Makefile -mailnews/addrbook/resources/content/Makefile -mailnews/addrbook/resources/locale/Makefile -mailnews/addrbook/resources/locale/en-US/Makefile -mailnews/addrbook/prefs/Makefile -mailnews/addrbook/prefs/resources/Makefile -mailnews/addrbook/prefs/resources/content/Makefile -mailnews/addrbook/prefs/resources/locale/Makefile -mailnews/addrbook/prefs/resources/locale/en-US/Makefile mailnews/base/Makefile mailnews/base/public/Makefile mailnews/base/src/Makefile @@ -27,23 +15,12 @@ mailnews/base/build/Makefile mailnews/base/search/Makefile mailnews/base/search/public/Makefile mailnews/base/search/src/Makefile -mailnews/base/search/resources/Makefile -mailnews/base/search/resources/content/Makefile -mailnews/base/search/resources/locale/Makefile -mailnews/base/search/resources/locale/en-US/Makefile mailnews/base/tests/Makefile mailnews/base/tests/accountmanager/Makefile mailnews/base/tests/identity/Makefile mailnews/base/resources/Makefile mailnews/base/resources/content/Makefile mailnews/base/resources/content/unix/Makefile -mailnews/base/resources/locale/Makefile -mailnews/base/resources/locale/en-US/Makefile -mailnews/base/prefs/Makefile -mailnews/base/prefs/resources/Makefile -mailnews/base/prefs/resources/content/Makefile -mailnews/base/prefs/resources/locale/Makefile -mailnews/base/prefs/resources/locale/en-US/Makefile mailnews/db/Makefile mailnews/db/msgdb/Makefile mailnews/db/msgdb/public/Makefile @@ -53,9 +30,6 @@ mailnews/local/Makefile mailnews/local/public/Makefile mailnews/local/src/Makefile mailnews/local/build/Makefile -mailnews/local/resources/Makefile -mailnews/local/resources/locale/Makefile -mailnews/local/resources/locale/en-US/Makefile mailnews/local/tests/Makefile mailnews/local/tests/pop3/Makefile mailnews/local/tests/mailbox/Makefile @@ -63,22 +37,14 @@ mailnews/imap/Makefile mailnews/imap/build/Makefile mailnews/imap/public/Makefile mailnews/imap/src/Makefile -mailnews/imap/resources/Makefile -mailnews/imap/resources/locale/Makefile -mailnews/imap/resources/locale/en-US/Makefile mailnews/imap/tests/Makefile mailnews/imap/tests/harness/Makefile mailnews/news/Makefile mailnews/news/public/Makefile mailnews/news/src/Makefile mailnews/news/build/Makefile -mailnews/news/resources/Makefile -mailnews/news/resources/content/Makefile -mailnews/news/resources/locale/Makefile -mailnews/news/resources/locale/en-US/Makefile mailnews/mime/Makefile mailnews/mime/cthandlers/Makefile -mailnews/mime/cthandlers/resources/Makefile mailnews/mime/cthandlers/vcard/Makefile mailnews/mime/cthandlers/calendar/Makefile mailnews/mime/cthandlers/smimestub/Makefile @@ -86,8 +52,6 @@ mailnews/mime/cthandlers/signstub/Makefile mailnews/mime/emitters/Makefile mailnews/mime/emitters/build/Makefile mailnews/mime/emitters/src/Makefile -mailnews/mime/emitters/resources/Makefile -mailnews/mime/emitters/resources/content/Makefile mailnews/mime/tests/Makefile mailnews/mime/tests/xpcomtest/Makefile mailnews/mime/tests/mimetest/Makefile @@ -100,15 +64,6 @@ mailnews/compose/Makefile mailnews/compose/public/Makefile mailnews/compose/src/Makefile mailnews/compose/build/Makefile -mailnews/compose/resources/Makefile -mailnews/compose/resources/content/Makefile -mailnews/compose/resources/locale/Makefile -mailnews/compose/resources/locale/en-US/Makefile -mailnews/compose/prefs/Makefile -mailnews/compose/prefs/resources/Makefile -mailnews/compose/prefs/resources/content/Makefile -mailnews/compose/prefs/resources/locale/Makefile -mailnews/compose/prefs/resources/locale/en-US/Makefile mailnews/compose/tests/Makefile mailnews/compose/tests/compose/Makefile mailnews/compose/tests/compose2/Makefile @@ -120,14 +75,7 @@ mailnews/public/Makefile mailnews/idl/Makefile mailnews/import/Makefile mailnews/import/public/Makefile -mailnews/import/resources/Makefile -mailnews/import/resources/content/Makefile -mailnews/import/resources/locale/Makefile -mailnews/import/resources/locale/en-us/Makefile mailnews/import/src/Makefile mailnews/import/text/Makefile -mailnews/import/text/resources/Makefile -mailnews/import/text/resources/locale/Makefile -mailnews/import/text/resources/locale/en-US/Makefile mailnews/import/text/src/Makefile diff --git a/mozilla/mailnews/mime/Makefile.in b/mozilla/mailnews/mime/Makefile.in index bd877d1359a..edb51e703be 100644 --- a/mozilla/mailnews/mime/Makefile.in +++ b/mozilla/mailnews/mime/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src emitters cthandlers build resources +DIRS = public src emitters cthandlers build ifdef ENABLE_TESTS DIRS += tests diff --git a/mozilla/mailnews/mime/abstatus/Makefile.in b/mozilla/mailnews/mime/abstatus/Makefile.in index be7a95d8c53..3a543ea9f9a 100644 --- a/mozilla/mailnews/mime/abstatus/Makefile.in +++ b/mozilla/mailnews/mime/abstatus/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = src build resources +DIRS = src build include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/mime/cthandlers/Makefile.in b/mozilla/mailnews/mime/cthandlers/Makefile.in index ef04a5d35cd..37b2d462fe2 100644 --- a/mozilla/mailnews/mime/cthandlers/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = vcard smimestub signstub resources +DIRS = vcard smimestub signstub include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/mime/emitters/Makefile.in b/mozilla/mailnews/mime/emitters/Makefile.in index be7a95d8c53..3a543ea9f9a 100644 --- a/mozilla/mailnews/mime/emitters/Makefile.in +++ b/mozilla/mailnews/mime/emitters/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = src build resources +DIRS = src build include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/news/Makefile.in b/mozilla/mailnews/news/Makefile.in index 363980a3eb8..4b3b329cfc7 100644 --- a/mozilla/mailnews/news/Makefile.in +++ b/mozilla/mailnews/news/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src build resources +DIRS = public src build include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/resources/Makefile.in b/mozilla/netwerk/resources/Makefile.in index ec9f55bc6f5..68b568656e6 100644 --- a/mozilla/netwerk/resources/Makefile.in +++ b/mozilla/netwerk/resources/Makefile.in @@ -26,8 +26,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = content locale - include $(topsrcdir)/config/rules.mk chrome:: diff --git a/mozilla/profile/pref-migrator/resources/Makefile.in b/mozilla/profile/pref-migrator/resources/Makefile.in index c0ae6100882..de9b7afe02f 100644 --- a/mozilla/profile/pref-migrator/resources/Makefile.in +++ b/mozilla/profile/pref-migrator/resources/Makefile.in @@ -26,6 +26,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = content locale - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/profile/resources/Makefile.in b/mozilla/profile/resources/Makefile.in index 113cbe0149f..203e6c01a91 100644 --- a/mozilla/profile/resources/Makefile.in +++ b/mozilla/profile/resources/Makefile.in @@ -26,6 +26,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = content locale - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/rdf/tests/domds/resources/Makefile.in b/mozilla/rdf/tests/domds/resources/Makefile.in index 38d78dec700..f57e7bd1552 100644 --- a/mozilla/rdf/tests/domds/resources/Makefile.in +++ b/mozilla/rdf/tests/domds/resources/Makefile.in @@ -28,16 +28,5 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdfdomds -CHROME_DIR = packages/core -CHROME_CONTENT_DIR = communicator/content/domviewer - -CHROME_CONTENT = \ - DOMDataSourceViewer.xul \ - DOMDataSourceViewer.css \ - DOMDataSourceViewer.js \ - DOMTree.xul \ - domviewer.html \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/blue/Makefile.in b/mozilla/themes/blue/Makefile.in index 1223245a73f..e4bf0dc0906 100644 --- a/mozilla/themes/blue/Makefile.in +++ b/mozilla/themes/blue/Makefile.in @@ -20,16 +20,11 @@ # DEPTH = ../.. -THEME_ROOT_DEPTH = @srcdir@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk - -DIRS = communicator global navigator editor messenger - include $(topsrcdir)/config/rules.mk chrome:: diff --git a/mozilla/themes/classic/Makefile.in b/mozilla/themes/classic/Makefile.in index 96f4fbbcf4e..21c73923412 100644 --- a/mozilla/themes/classic/Makefile.in +++ b/mozilla/themes/classic/Makefile.in @@ -20,15 +20,22 @@ # DEPTH = ../.. -THEME_ROOT_DEPTH = @srcdir@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk -DIRS = communicator editor global messenger navigator preview/win +DIRS = communicator/search/win \ + communicator/sidebar \ + communicator/win \ + global \ + messenger/win \ + messenger/addressbook/win \ + preview/win \ + editor/win \ + navigator/win \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/communicator/search/win/Makefile.in b/mozilla/themes/classic/communicator/search/win/Makefile.in index 4311753a7ee..aa674a458ae 100644 --- a/mozilla/themes/classic/communicator/search/win/Makefile.in +++ b/mozilla/themes/classic/communicator/search/win/Makefile.in @@ -20,11 +20,9 @@ # DEPTH = ../../../../.. -THEME_ROOT_DEPTH = @srcdir@/../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/communicator/sidebar/Makefile.in b/mozilla/themes/classic/communicator/sidebar/Makefile.in index 074fc2fba55..4dd58a60f9a 100644 --- a/mozilla/themes/classic/communicator/sidebar/Makefile.in +++ b/mozilla/themes/classic/communicator/sidebar/Makefile.in @@ -20,13 +20,11 @@ # DEPTH = ../../../.. -THEME_ROOT_DEPTH = @srcdir@/../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk DIRS = win unix diff --git a/mozilla/themes/classic/communicator/sidebar/unix/Makefile.in b/mozilla/themes/classic/communicator/sidebar/unix/Makefile.in index b285db21cff..338fadc8607 100644 --- a/mozilla/themes/classic/communicator/sidebar/unix/Makefile.in +++ b/mozilla/themes/classic/communicator/sidebar/unix/Makefile.in @@ -20,12 +20,10 @@ # DEPTH = ../../../../.. -THEME_ROOT_DEPTH = @srcdir@/../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/communicator/sidebar/win/Makefile.in b/mozilla/themes/classic/communicator/sidebar/win/Makefile.in index b285db21cff..338fadc8607 100644 --- a/mozilla/themes/classic/communicator/sidebar/win/Makefile.in +++ b/mozilla/themes/classic/communicator/sidebar/win/Makefile.in @@ -20,12 +20,10 @@ # DEPTH = ../../../../.. -THEME_ROOT_DEPTH = @srcdir@/../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/communicator/unix/Makefile.in b/mozilla/themes/classic/communicator/unix/Makefile.in index e1167f0f0da..e29029f2fd3 100644 --- a/mozilla/themes/classic/communicator/unix/Makefile.in +++ b/mozilla/themes/classic/communicator/unix/Makefile.in @@ -20,12 +20,10 @@ # DEPTH = ../../../.. -THEME_ROOT_DEPTH = @srcdir@/../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/communicator/win/Makefile.in b/mozilla/themes/classic/communicator/win/Makefile.in index 5f126d8fa17..e1d403b23f6 100644 --- a/mozilla/themes/classic/communicator/win/Makefile.in +++ b/mozilla/themes/classic/communicator/win/Makefile.in @@ -20,11 +20,9 @@ # DEPTH = ../../../.. -THEME_ROOT_DEPTH = @srcdir@/../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/editor/win/Makefile.in b/mozilla/themes/classic/editor/win/Makefile.in index 0b5494f3580..c4d580ab6a1 100644 --- a/mozilla/themes/classic/editor/win/Makefile.in +++ b/mozilla/themes/classic/editor/win/Makefile.in @@ -20,12 +20,10 @@ # DEPTH = ../../../.. -THEME_ROOT_DEPTH = @srcdir@/../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/global/Makefile.in b/mozilla/themes/classic/global/Makefile.in index cda2a9f86b4..0f738353e16 100644 --- a/mozilla/themes/classic/global/Makefile.in +++ b/mozilla/themes/classic/global/Makefile.in @@ -20,13 +20,11 @@ # DEPTH = ../../.. -THEME_ROOT_DEPTH = @srcdir@/.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk ifeq ($(OS_ARCH),OS2) DIRS = win @@ -34,111 +32,4 @@ else DIRS = win unix endif -# 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) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/global/unix/Makefile.in b/mozilla/themes/classic/global/unix/Makefile.in index 6252480a21c..0c1d12585be 100644 --- a/mozilla/themes/classic/global/unix/Makefile.in +++ b/mozilla/themes/classic/global/unix/Makefile.in @@ -20,12 +20,10 @@ # DEPTH = ../../../.. -THEME_ROOT_DEPTH = @srcdir@/../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/global/win/Makefile.in b/mozilla/themes/classic/global/win/Makefile.in index 652a758dd68..0261ea5a1af 100644 --- a/mozilla/themes/classic/global/win/Makefile.in +++ b/mozilla/themes/classic/global/win/Makefile.in @@ -20,11 +20,9 @@ # DEPTH = ../../../.. -THEME_ROOT_DEPTH = @srcdir@/../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/messenger/addressbook/win/Makefile.in b/mozilla/themes/classic/messenger/addressbook/win/Makefile.in index 96da18a1694..b1876dc5e2e 100644 --- a/mozilla/themes/classic/messenger/addressbook/win/Makefile.in +++ b/mozilla/themes/classic/messenger/addressbook/win/Makefile.in @@ -20,11 +20,9 @@ # DEPTH = ../../../../.. -THEME_ROOT_DEPTH = @srcdir@/../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/messenger/win/Makefile.in b/mozilla/themes/classic/messenger/win/Makefile.in index 652a758dd68..0261ea5a1af 100644 --- a/mozilla/themes/classic/messenger/win/Makefile.in +++ b/mozilla/themes/classic/messenger/win/Makefile.in @@ -20,11 +20,9 @@ # DEPTH = ../../../.. -THEME_ROOT_DEPTH = @srcdir@/../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/navigator/unix/Makefile.in b/mozilla/themes/classic/navigator/unix/Makefile.in index 652a758dd68..0261ea5a1af 100644 --- a/mozilla/themes/classic/navigator/unix/Makefile.in +++ b/mozilla/themes/classic/navigator/unix/Makefile.in @@ -20,11 +20,9 @@ # DEPTH = ../../../.. -THEME_ROOT_DEPTH = @srcdir@/../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/navigator/win/Makefile.in b/mozilla/themes/classic/navigator/win/Makefile.in index 652a758dd68..0261ea5a1af 100644 --- a/mozilla/themes/classic/navigator/win/Makefile.in +++ b/mozilla/themes/classic/navigator/win/Makefile.in @@ -20,11 +20,9 @@ # DEPTH = ../../../.. -THEME_ROOT_DEPTH = @srcdir@/../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/preview/win/Makefile.in b/mozilla/themes/classic/preview/win/Makefile.in index c2a91803523..a3168e544c9 100644 --- a/mozilla/themes/classic/preview/win/Makefile.in +++ b/mozilla/themes/classic/preview/win/Makefile.in @@ -20,13 +20,11 @@ # DEPTH = ../../../.. -THEME_ROOT_DEPTH = @srcdir@/../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/makefiles b/mozilla/themes/makefiles index 37014111826..c42de68c1c6 100644 --- a/mozilla/themes/makefiles +++ b/mozilla/themes/makefiles @@ -1,43 +1,15 @@ themes/Makefile themes/modern/Makefile -themes/modern/communicator/Makefile -themes/modern/communicator/bookmarks/Makefile -themes/modern/communicator/directory/Makefile -themes/modern/communicator/profile/Makefile -themes/modern/communicator/regviewer/Makefile -themes/modern/communicator/related/Makefile -themes/modern/communicator/search/Makefile -themes/modern/communicator/sidebar/Makefile -themes/modern/communicator/xpinstall/Makefile -themes/modern/editor/Makefile -themes/modern/editor/images/Makefile -themes/modern/global/Makefile -themes/modern/messenger/Makefile -themes/modern/messenger/addressbook/Makefile -themes/modern/messenger/messengercompose/Makefile -themes/modern/navigator/Makefile -themes/classic/communicator/bookmarks/Makefile -themes/classic/communicator/Makefile themes/classic/communicator/unix/Makefile -themes/classic/communicator/directory/Makefile -themes/classic/communicator/profile/Makefile -themes/classic/communicator/regviewer/Makefile -themes/classic/communicator/related/Makefile -themes/classic/communicator/search/Makefile themes/classic/communicator/sidebar/Makefile themes/classic/communicator/sidebar/unix/Makefile -themes/classic/communicator/xpinstall/Makefile +themes/classic/communicator/sidebar/win/Makefile themes/classic/Makefile -themes/classic/editor/images/Makefile -themes/classic/editor/Makefile themes/classic/editor/win/Makefile themes/classic/global/unix/Makefile themes/classic/global/Makefile -themes/classic/messenger/addressbook/Makefile themes/classic/messenger/addressbook/win/Makefile -themes/classic/messenger/Makefile -themes/classic/messenger/messengercompose/Makefile -themes/classic/navigator/Makefile themes/classic/navigator/unix/Makefile +themes/classic/navigator/win/Makefile themes/classic/preview/win/Makefile diff --git a/mozilla/themes/modern/Makefile.in b/mozilla/themes/modern/Makefile.in index 29edfd76406..2b60dea1a28 100644 --- a/mozilla/themes/modern/Makefile.in +++ b/mozilla/themes/modern/Makefile.in @@ -20,13 +20,11 @@ # DEPTH = ../.. -THEME_ROOT_DEPTH = @srcdir@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(THEME_ROOT_DEPTH)/theme.mk include $(topsrcdir)/config/rules.mk chrome:: diff --git a/mozilla/xpfe/browser/resources/content/Makefile.in b/mozilla/xpfe/browser/resources/content/Makefile.in index 6caacb77823..889da139ca0 100644 --- a/mozilla/xpfe/browser/resources/content/Makefile.in +++ b/mozilla/xpfe/browser/resources/content/Makefile.in @@ -32,31 +32,6 @@ else DIRS = unix endif -CHROME_DIR=packages/core -CHROME_CONTENT_DIR=navigator/content - -CHROME_CONTENT = \ - nsContextMenu.js \ - tooltip.js \ - openLocation.js \ - viewsource.js \ - navigator.xul \ - sessionHistoryUI.js \ - keywords.js \ - navigatorOverlay.xul \ - navExtraOverlay.xul \ - navigator.js \ - navigatorDD.js \ - openLocation.xul \ - NetSupportConfirmYN.xul \ - NetSupportConfirmCheckYN.xul \ - pageInfo.xul \ - pageInfo.js \ - askViewZoom.xul \ - askViewZoom.js \ - viewSource.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk # the need for this stuff got whacked when smfr removed the build id diff --git a/mozilla/xpfe/browser/resources/content/os2/Makefile.in b/mozilla/xpfe/browser/resources/content/os2/Makefile.in index 0cd2c8359ea..a70700653a4 100644 --- a/mozilla/xpfe/browser/resources/content/os2/Makefile.in +++ b/mozilla/xpfe/browser/resources/content/os2/Makefile.in @@ -26,12 +26,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CHROME_DIR=packages/core -CHROME_CONTENT_DIR=navigator/content - -CHROME_CONTENT = \ - platformNavigationBindings.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/browser/resources/content/unix/Makefile.in b/mozilla/xpfe/browser/resources/content/unix/Makefile.in index 0cd2c8359ea..a70700653a4 100644 --- a/mozilla/xpfe/browser/resources/content/unix/Makefile.in +++ b/mozilla/xpfe/browser/resources/content/unix/Makefile.in @@ -26,12 +26,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CHROME_DIR=packages/core -CHROME_CONTENT_DIR=navigator/content - -CHROME_CONTENT = \ - platformNavigationBindings.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/browser/resources/locale/en-US/unix/Makefile.in b/mozilla/xpfe/browser/resources/locale/en-US/unix/Makefile.in index a9f96447035..f21c6e7eb7f 100644 --- a/mozilla/xpfe/browser/resources/locale/en-US/unix/Makefile.in +++ b/mozilla/xpfe/browser/resources/locale/en-US/unix/Makefile.in @@ -26,11 +26,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CHROME_DIR=locales/en-US -CHROME_L10N_DIR=navigator/locale - -CHROME_L10N = \ - platformNavigationBindings.dtd \ - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/autocomplete/Makefile.in b/mozilla/xpfe/components/autocomplete/Makefile.in index 136dc7a9926..8e79579887a 100644 --- a/mozilla/xpfe/components/autocomplete/Makefile.in +++ b/mozilla/xpfe/components/autocomplete/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src resources +DIRS = public src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/bookmarks/Makefile.in b/mozilla/xpfe/components/bookmarks/Makefile.in index 136dc7a9926..8e79579887a 100644 --- a/mozilla/xpfe/components/bookmarks/Makefile.in +++ b/mozilla/xpfe/components/bookmarks/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src resources +DIRS = public src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/console/Makefile.in b/mozilla/xpfe/components/console/Makefile.in index cca2dcec04c..ce93dc8c086 100644 --- a/mozilla/xpfe/components/console/Makefile.in +++ b/mozilla/xpfe/components/console/Makefile.in @@ -27,8 +27,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = resources - include $(topsrcdir)/config/rules.mk install:: diff --git a/mozilla/xpfe/components/directory/Makefile.in b/mozilla/xpfe/components/directory/Makefile.in index a1a44ed4949..b7ced28d7c8 100644 --- a/mozilla/xpfe/components/directory/Makefile.in +++ b/mozilla/xpfe/components/directory/Makefile.in @@ -34,19 +34,6 @@ REQUIRES = xpcom necko rdf layout timer js xpconnect docshell widget dom webshel CPPSRCS = nsDirectoryViewer.cpp -CHROME_DIR = . -CHROME_CONTENT_DIR = packages/core/communicator/content/directory -CHROME_L10N_DIR = locales/en-US/communicator/locale/directory - -CHROME_CONTENT = \ - directory.xul \ - directory.js \ - $(NULL) - -CHROME_L10N = \ - locale/en-US/directory.dtd \ - $(NULL) - # we don't want the shared lib, but we want to force the creation of a # static lib. override NO_SHARED_LIB=1 diff --git a/mozilla/xpfe/components/filepicker/Makefile.in b/mozilla/xpfe/components/filepicker/Makefile.in index 53e09867871..a20b15f0911 100644 --- a/mozilla/xpfe/components/filepicker/Makefile.in +++ b/mozilla/xpfe/components/filepicker/Makefile.in @@ -28,7 +28,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = res src +DIRS = src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/find/Makefile.in b/mozilla/xpfe/components/find/Makefile.in index 136dc7a9926..8e79579887a 100644 --- a/mozilla/xpfe/components/find/Makefile.in +++ b/mozilla/xpfe/components/find/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src resources +DIRS = public src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/history/Makefile.in b/mozilla/xpfe/components/history/Makefile.in index 136dc7a9926..8e79579887a 100644 --- a/mozilla/xpfe/components/history/Makefile.in +++ b/mozilla/xpfe/components/history/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src resources +DIRS = public src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in index 3cf56f9ef74..61bcc797830 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in +++ b/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in @@ -28,56 +28,5 @@ include $(DEPTH)/config/autoconf.mk DIRS = unix -CHROME_DIR = packages/core -CHROME_CONTENT_DIR = communicator/content/pref - -CHROME_CONTENT = \ - nsPrefWindow.js \ - pref.xul \ - pref-advanced.xul \ - pref-appearance.xul \ - pref-applications.xul \ - pref-applications.js \ - pref-applications-edit.xul \ - pref-applications-new.js \ - pref-applications-new.xul \ - overrideHandler.js \ - pref-cache.xul \ - pref-cache.js \ - pref-charset.xul \ - pref-charset.js \ - pref-colors.xul \ - pref-cookies.xul \ - pref-colors.js \ - pref-themes.xul \ - pref-themes.js \ - pref-debug.xul \ - pref-debug1.xul \ - pref-debug2.xul \ - pref-download.xul \ - pref-fonts.xul \ - pref-fonts.js \ - pref-history.xul \ - pref-images.xul \ - pref-languages.xul \ - pref-languages-add.xul \ - pref-languages.js \ - pref-navigator.xul \ - pref-navigator.js \ - pref-offline.xul \ - pref-policies.xul \ - pref-proxies.js \ - pref-proxies.xul \ - pref-mousewheel.xul \ - pref-wallet.xul \ - pref-passwords.xul \ - pref-search.js \ - pref-search.xul \ - pref-smart_browsing.xul \ - pref-smartupdate.xul \ - prefutilities.js \ - preftree.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/prefwindow/resources/content/unix/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/content/unix/Makefile.in index a0a11639218..f21c6e7eb7f 100644 --- a/mozilla/xpfe/components/prefwindow/resources/content/unix/Makefile.in +++ b/mozilla/xpfe/components/prefwindow/resources/content/unix/Makefile.in @@ -26,12 +26,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CHROME_DIR = packages/core -CHROME_CONTENT_DIR = communicator/content/pref - -CHROME_CONTENT = \ - platformPrefOverlay.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in index 4db22a0ec61..5b2f3f9f88d 100644 --- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in +++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in @@ -28,42 +28,5 @@ include $(DEPTH)/config/autoconf.mk DIRS = unix -CHROME_DIR = locales/en-US -CHROME_L10N_DIR = communicator/locale/pref - -CHROME_L10N = \ - pref-advanced.dtd \ - pref-appearance.dtd \ - pref-applications.dtd \ - pref-applications.properties \ - pref-applications-edit.dtd \ - pref-cache.dtd \ - pref-colors.dtd \ - pref-themes.dtd \ - pref-charset.dtd \ - pref-cookies.dtd \ - pref-debug.dtd \ - pref-debug1.dtd \ - pref-debug2.dtd \ - pref-download.dtd \ - pref-fonts.dtd \ - pref-history.dtd \ - pref-images.dtd \ - pref-languages.dtd \ - pref-navigator.dtd \ - pref-offline.dtd \ - pref-policies.dtd \ - pref-proxies.dtd \ - pref-search.dtd \ - pref-smart_browsing.dtd \ - pref-smartupdate.dtd \ - pref-mousewheel.dtd \ - pref-wallet.dtd \ - pref-passwords.dtd \ - prefutilities.properties \ - preftree.dtd \ - pref.dtd \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/unix/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/unix/Makefile.in index de27308a933..fb2869d3935 100644 --- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/unix/Makefile.in +++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/unix/Makefile.in @@ -26,12 +26,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CHROME_DIR = locales/en-US -CHROME_L10N_DIR = communicator/locale/pref - -CHROME_L10N = \ - platformPrefOverlay.dtd \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/regviewer/Makefile.in b/mozilla/xpfe/components/regviewer/Makefile.in index 0f65e9a3735..edc9952058c 100644 --- a/mozilla/xpfe/components/regviewer/Makefile.in +++ b/mozilla/xpfe/components/regviewer/Makefile.in @@ -36,19 +36,6 @@ XPIDLSRCS = nsIRegistryDataSource.idl CPPSRCS = nsRegistryDataSource.cpp -CHROME_DIR = . -CHROME_CONTENT_DIR = packages/core/communicator/content/regviewer -CHROME_L10N_DIR = locales/en-US/communicator/locale/regviewer - -CHROME_CONTENT = \ - regviewer.xul \ - regviewer.js \ - $(NULL) - -CHROME_L10N = \ - locale/en-US/regviewer.dtd \ - $(NULL) - EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ $(XPCOM_LIBS) \ diff --git a/mozilla/xpfe/components/related/Makefile.in b/mozilla/xpfe/components/related/Makefile.in index 136dc7a9926..8e79579887a 100644 --- a/mozilla/xpfe/components/related/Makefile.in +++ b/mozilla/xpfe/components/related/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src resources +DIRS = public src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/search/Makefile.in b/mozilla/xpfe/components/search/Makefile.in index 73424972d25..14144f25e85 100644 --- a/mozilla/xpfe/components/search/Makefile.in +++ b/mozilla/xpfe/components/search/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = datasets resources public src +DIRS = datasets public src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/sidebar/Makefile.in b/mozilla/xpfe/components/sidebar/Makefile.in index 27a7893891c..c89806fe2bc 100644 --- a/mozilla/xpfe/components/sidebar/Makefile.in +++ b/mozilla/xpfe/components/sidebar/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public resources src +DIRS = public src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/timebomb/Makefile.in b/mozilla/xpfe/components/timebomb/Makefile.in index 0b3ae9c07f3..49864e719e1 100644 --- a/mozilla/xpfe/components/timebomb/Makefile.in +++ b/mozilla/xpfe/components/timebomb/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = tools resources +DIRS = tools MODULE = appcomps LIBRARY_NAME = timebomb_s diff --git a/mozilla/xpfe/components/ucth/Makefile.in b/mozilla/xpfe/components/ucth/Makefile.in index 136dc7a9926..8e79579887a 100644 --- a/mozilla/xpfe/components/ucth/Makefile.in +++ b/mozilla/xpfe/components/ucth/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src resources +DIRS = public src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/xfer/Makefile.in b/mozilla/xpfe/components/xfer/Makefile.in index 136dc7a9926..8e79579887a 100644 --- a/mozilla/xpfe/components/xfer/Makefile.in +++ b/mozilla/xpfe/components/xfer/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src resources +DIRS = public src include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpinstall/res/Makefile.in b/mozilla/xpinstall/res/Makefile.in index 40d2dcfbd4c..36f5219f398 100644 --- a/mozilla/xpinstall/res/Makefile.in +++ b/mozilla/xpinstall/res/Makefile.in @@ -26,7 +26,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = locale content - include $(topsrcdir)/config/rules.mk