Set MODULE in makefiles at the top of a heirarchy so that module-deps lists are more precise and builds will have the proper order if some subdirs contain other modules.

2025-01-19 01:10:22 +00:00 · 2003-08-16 00:42:35 +00:00 · 2003-08-16 00:42:35 +00:00 · 1b51ba858c
commit 1b51ba858c
parent 6039de1cfc
94 changed files with 112 additions and 2 deletions
--- a/accessible/Makefile.in
+++ b/accessible/Makefile.in
@ -26,6 +26,7 @@ VPATH   = @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE	= accessibility
 DIRS    = public src build

 include $(topsrcdir)/config/rules.mk
--- a/calendar/Makefile.in
+++ b/calendar/Makefile.in
@ -41,6 +41,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE	= calendar
 DIRS = libxpical resources

 include $(topsrcdir)/config/rules.mk
--- a/caps/Makefile.in
+++ b/caps/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= caps
 DIRS		= idl include src

 include $(topsrcdir)/config/rules.mk
--- a/content/Makefile.in
+++ b/content/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= content
 DIRS		= base html xml xul xbl xsl

 ifdef MOZ_SVG
--- a/content/xul/content/Makefile.in
+++ b/content/xul/content/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xul
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/content/xul/document/Makefile.in
+++ b/content/xul/document/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xuldoc
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/content/xul/templates/Makefile.in
+++ b/content/xul/templates/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xultmpl
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/dbm/Makefile.in
+++ b/dbm/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= dbm
 DIRS		= include src

 ifdef ENABLE_TESTS
--- a/directory/xpcom/base/Makefile.in
+++ b/directory/xpcom/base/Makefile.in
@ -38,6 +38,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= mozldap
 DIRS		= public src resources

 include $(topsrcdir)/config/rules.mk
--- a/docshell/Makefile.in
+++ b/docshell/Makefile.in
@ -25,6 +25,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE = docshell
 DIRS=base build resources

 include $(topsrcdir)/config/rules.mk
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= dom
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/editor/Makefile.in
+++ b/editor/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= editor
 DIRS		= public idl txtsvc libeditor txmgr composer

 # We need to export headers from composer/ even if we're not building composer.
--- a/editor/txmgr/Makefile.in
+++ b/editor/txmgr/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= txmgr
 DIRS		= public src idl

 ifdef ENABLE_TESTS
--- a/editor/txtsvc/Makefile.in
+++ b/editor/txtsvc/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= txtsvc
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/embedding/browser/gtk/Makefile.in
+++ b/embedding/browser/gtk/Makefile.in
@ -25,6 +25,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= gtkembedmoz
 DIRS=src tests

 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/commandhandler/Makefile.in
+++ b/embedding/components/commandhandler/Makefile.in
@ -24,6 +24,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE	= commandhandler
 DIRS = public src

 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/find/Makefile.in
+++ b/embedding/components/find/Makefile.in
@ -24,6 +24,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= find
 DIRS = public src

 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/profilesharingsetup/Makefile.in
+++ b/embedding/components/profilesharingsetup/Makefile.in
@ -41,6 +41,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE = profilesharingsetup
 DIRS = public src

 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/webbrowserpersist/Makefile.in
+++ b/embedding/components/webbrowserpersist/Makefile.in
@ -24,6 +24,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE	= webbrowserpersist
 DIRS = public src

 include $(topsrcdir)/config/rules.mk
--- a/expat/Makefile.in
+++ b/expat/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= expat
 DIRS		= xmlparse xmltok

 include $(topsrcdir)/config/rules.mk
--- a/extensions/inspector/Makefile.in
+++ b/extensions/inspector/Makefile.in
@ -27,6 +27,8 @@ VPATH=@srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE	= inspector
+
 DIRS=base build

 include $(topsrcdir)/config/rules.mk
--- a/extensions/layout-debug/Makefile.in
+++ b/extensions/layout-debug/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= layout_debug
 DIRS		= src ui

 include $(topsrcdir)/config/rules.mk
--- a/extensions/p3p/Makefile.in
+++ b/extensions/p3p/Makefile.in
@ -42,6 +42,7 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE	= p3p
 DIRS      = public src

 include $(topsrcdir)/config/rules.mk
--- a/extensions/pref/autoconfig/Makefile.in
+++ b/extensions/pref/autoconfig/Makefile.in
@ -39,6 +39,7 @@ VPATH            = @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= autoconfig
 DIRS             = public resources src

 include $(topsrcdir)/config/rules.mk
--- a/extensions/spellcheck/Makefile.in
+++ b/extensions/spellcheck/Makefile.in
@ -41,6 +41,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= spellchecker
 DIRS		= src idl myspell

 include $(topsrcdir)/config/rules.mk
--- a/extensions/spellcheck/myspell/Makefile.in
+++ b/extensions/spellcheck/myspell/Makefile.in
@ -41,6 +41,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= myspell
 DIRS		= src dictionaries

 include $(topsrcdir)/config/rules.mk
--- a/extensions/transformiix/Makefile.in
+++ b/extensions/transformiix/Makefile.in
@ -26,6 +26,7 @@ VPATH           = @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= transformiix
 DIRS            = source
 ifndef TX_EXE
 DIRS += build resources
--- a/extensions/typeaheadfind/Makefile.in
+++ b/extensions/typeaheadfind/Makefile.in
@ -31,6 +31,7 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= typeaheadfind
 DIRS		= public src resources

 include $(topsrcdir)/config/rules.mk
--- a/extensions/universalchardet/Makefile.in
+++ b/extensions/universalchardet/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= universalchardet
 DIRS		= src

 ifdef ENABLE_TESTS
--- a/extensions/webservices/Makefile.in
+++ b/extensions/webservices/Makefile.in
@ -26,6 +26,7 @@ VPATH       = @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE	= websrvcs
 DIRS	= public security schema soap interfaceinfo wsdl proxy build

 include $(topsrcdir)/config/rules.mk
--- a/extensions/xmlextras/Makefile.in
+++ b/extensions/xmlextras/Makefile.in
@ -26,6 +26,7 @@ VPATH           = @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xmlextras
 DIRS            = base pointers build

 ifdef ENABLE_TESTS
--- a/extensions/xmlterm/Makefile.in
+++ b/extensions/xmlterm/Makefile.in
@ -57,6 +57,7 @@ VPATH	   = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 endif

+MODULE = xmlterm

 # Debug option
 DEBUG = 1
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= gfx
 DIRS		= public idl src

 ifdef ENABLE_TESTS
--- a/htmlparser/Makefile.in
+++ b/htmlparser/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= htmlparser
 DIRS		= public src

 ifdef ENABLE_TESTS
--- a/intl/locale/Makefile.in
+++ b/intl/locale/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= locale
 DIRS		= public idl src

 include $(topsrcdir)/config/rules.mk
--- a/intl/lwbrk/Makefile.in
+++ b/intl/lwbrk/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= lwbrk
 DIRS		= idl public src

 ifdef ENABLE_TESTS
--- a/intl/strres/Makefile.in
+++ b/intl/strres/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= intl
 DIRS		= public src

 ifdef ENABLE_TESTS
--- a/intl/uconv/Makefile.in
+++ b/intl/uconv/Makefile.in
@ -38,6 +38,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= uconv
+
 DIRS		= idl public util ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm native src

 ifdef MOZ_MATHML
--- a/intl/unicharutil/Makefile.in
+++ b/intl/unicharutil/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= unicharutil
+
 DIRS		= idl public util src tables

 ifdef ENABLE_TESTS
--- a/js/src/xpconnect/Makefile.in
+++ b/js/src/xpconnect/Makefile.in
@ -38,6 +38,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xpconnect
 DIRS		= public idl

 ifdef MOZ_JSLOADER
--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= layout
+
 DIRS		= base html xul

 ifdef MOZ_MATHML
--- a/mailnews/base/Makefile.in
+++ b/mailnews/base/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= msgbase
 DIRS		= public src util search ispdata

 ifndef MOZ_STATIC_MAIL_BUILD
--- a/mailnews/compose/Makefile.in
+++ b/mailnews/compose/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= msgcompose
+
 DIRS		= public src

 ifndef MOZ_STATIC_MAIL_BUILD
--- a/mailnews/db/msgdb/Makefile.in
+++ b/mailnews/db/msgdb/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= msgdb
 DIRS		= public src

 ifndef MOZ_STATIC_MAIL_BUILD
--- a/mailnews/extensions/bayesian-spam-filter/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/Makefile.in
@ -43,6 +43,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= bayesflt
+
 DIRS=src

 ifndef MOZ_STATIC_MAIL_BUILD
--- a/mailnews/extensions/mailviews/Makefile.in
+++ b/mailnews/extensions/mailviews/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= mailview
+
 DIRS		= public src resources

 ifndef MOZ_STATIC_MAIL_BUILD
--- a/mailnews/extensions/mdn/Makefile.in
+++ b/mailnews/extensions/mdn/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= msgmdn
 DIRS		= src

 ifndef MOZ_STATIC_MAIL_BUILD
--- a/mailnews/extensions/smime/Makefile.in
+++ b/mailnews/extensions/smime/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= msgsmime
 DIRS		= public src build

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/imap/Makefile.in
+++ b/mailnews/imap/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= msgimap
 DIRS		= public src

 ifndef MOZ_STATIC_MAIL_BUILD
--- a/mailnews/import/Makefile.in
+++ b/mailnews/import/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= import
+
 DIRS		= public src text comm4x

 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
--- a/mailnews/import/comm4x/Makefile.in
+++ b/mailnews/import/comm4x/Makefile.in
@ -42,6 +42,7 @@ srcdir      = @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE	= impComm4xMail
 DIRS =public src

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/local/Makefile.in
+++ b/mailnews/local/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= msglocal
 DIRS		= public src

 ifndef MOZ_STATIC_MAIL_BUILD
--- a/mailnews/mime/Makefile.in
+++ b/mailnews/mime/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= mime
+
 DIRS		= public src emitters cthandlers

 ifndef MOZ_STATIC_MAIL_BUILD
--- a/mailnews/mime/emitters/Makefile.in
+++ b/mailnews/mime/emitters/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= mimemitter
 DIRS		= src

 ifndef MOZ_STATIC_MAIL_BUILD
--- a/modules/libpr0n/Makefile.in
+++ b/modules/libpr0n/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= imglib2
+
 DIRS		= public src 

 ifdef MOZ_IMG_DECODERS
--- a/modules/libpref/Makefile.in
+++ b/modules/libpref/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= pref
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/modules/libreg/Makefile.in
+++ b/modules/libreg/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= libreg
+
 DIRS		= include src standalone

 include $(topsrcdir)/config/rules.mk
--- a/modules/libutil/Makefile.in
+++ b/modules/libutil/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= util
+
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/modules/oji/Makefile.in
+++ b/modules/oji/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= oji
+
 DIRS		= public 

 ifdef MOZ_OJI
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= plugin
+
 DIRS		= base/public base/src 

 # These subdirs rely on GTK libraries and header files, it is not
--- a/modules/zlib/Makefile.in
+++ b/modules/zlib/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= zlib
 DIRS		= src

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE	= nkcache
 DIRS	= public src

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= mimetype
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/gopher/Makefile.in
+++ b/netwerk/protocol/gopher/Makefile.in
@ -25,6 +25,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= necko2
 DIRS		= src

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/viewsource/Makefile.in
+++ b/netwerk/protocol/viewsource/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= necko2
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/parser/expat/Makefile.in
+++ b/parser/expat/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= expat
 DIRS		= xmlparse xmltok

 include $(topsrcdir)/config/rules.mk
--- a/parser/htmlparser/Makefile.in
+++ b/parser/htmlparser/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= htmlparser
 DIRS		= public src

 ifdef ENABLE_TESTS
--- a/profile/Makefile.in
+++ b/profile/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= profile
+
 DIRS		= public dirserviceprovider 

 ifndef MOZ_SINGLE_PROFILE
--- a/profile/dirserviceprovider/Makefile.in
+++ b/profile/dirserviceprovider/Makefile.in
@ -41,6 +41,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= profdirserviceprovider
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/profile/pref-migrator/Makefile.in
+++ b/profile/pref-migrator/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= prefmigr
 DIRS		= public src resources

 include $(topsrcdir)/config/rules.mk
--- a/rdf/Makefile.in
+++ b/rdf/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= rdf
 DIRS		= base util datasource resources build

 ifndef MOZ_XUL_APP
--- a/rdf/util/Makefile.in
+++ b/rdf/util/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= rdfutil
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/security/manager/boot/Makefile.in
+++ b/security/manager/boot/Makefile.in
@ -40,6 +40,7 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

+MODULE		= pipboot
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/security/manager/pki/Makefile.in
+++ b/security/manager/pki/Makefile.in
@ -25,6 +25,7 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

+MODULE		= pippki
 DIRS		= public resources src

 include $(topsrcdir)/config/rules.mk
--- a/security/manager/ssl/Makefile.in
+++ b/security/manager/ssl/Makefile.in
@ -25,6 +25,7 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

+MODULE		= pipnss
 DIRS		= resources src public

 include $(topsrcdir)/config/rules.mk
--- a/sun-java/Makefile.in
+++ b/sun-java/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= java
 DIRS		= stubs

 include $(topsrcdir)/config/rules.mk
--- a/sun-java/stubs/Makefile.in
+++ b/sun-java/stubs/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= java
 DIRS		= jri include

 include $(topsrcdir)/config/rules.mk
--- a/view/Makefile.in
+++ b/view/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= view
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/xpcom/proxy/Makefile.in
+++ b/xpcom/proxy/Makefile.in
@ -22,6 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xpcom
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/xpcom/reflect/Makefile.in
+++ b/xpcom/reflect/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xpcom
 DIRS		= xptinfo xptcall

 include $(topsrcdir)/config/rules.mk
--- a/xpcom/reflect/xptcall/Makefile.in
+++ b/xpcom/reflect/xptcall/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xpcom
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/xpcom/reflect/xptinfo/Makefile.in
+++ b/xpcom/reflect/xptinfo/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xpcom
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/xpcom/string/Makefile.in
+++ b/xpcom/string/Makefile.in
@ -27,6 +27,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= string
 DIRS		= public src obsolete embed

 #ifdef ENABLE_TESTS
--- a/xpcom/tools/Makefile.in
+++ b/xpcom/tools/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xpcom
 DIRS		= registry

 ifeq ($(OS_ARCH),WINNT)
--- a/xpcom/typelib/Makefile.in
+++ b/xpcom/typelib/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xpcom
 DIRS		= xpt xpidl

 include $(topsrcdir)/config/rules.mk
--- a/xpcom/typelib/xpt/Makefile.in
+++ b/xpcom/typelib/xpt/Makefile.in
@ -26,9 +26,9 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS		= public src
+MODULE		= xpcom

-DIRS		+= tools
+DIRS		= public src tools

 include $(topsrcdir)/config/rules.mk

--- a/xpfe/appshell/Makefile.in
+++ b/xpfe/appshell/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= appshell
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/xpfe/browser/Makefile.in
+++ b/xpfe/browser/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= browser
+
 DIRS		= src samples resources

 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/download-manager/Makefile.in
+++ b/xpfe/components/download-manager/Makefile.in
@ -26,6 +26,7 @@ VPATH   = @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE	= downloadmanager
 DIRS    = public src resources

 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/filepicker/Makefile.in
+++ b/xpfe/components/filepicker/Makefile.in
@ -28,6 +28,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= filepicker
+
 ifdef MOZ_XUL
 ifeq (,$(filter beos os2 mac photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = public src
--- a/xpfe/components/history/Makefile.in
+++ b/xpfe/components/history/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= history
 DIRS		= src

 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/shistory/Makefile.in
+++ b/xpfe/components/shistory/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= shistory
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/xremote/Makefile.in
+++ b/xpfe/components/xremote/Makefile.in
@ -25,6 +25,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xremoteservice
 DIRS		= src

 include $(topsrcdir)/config/rules.mk
--- a/xpinstall/Makefile.in
+++ b/xpinstall/Makefile.in
@ -30,6 +30,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= xpinstall
 DIRS		= public res src stub cleanup

 ifdef MOZ_INSTALLER