Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trim module.mk's xpcom entry since all of xpcom's external deps have been removed.

Browse Source 
Move 3rd party libs into tier_1 dir list.
Move standalone application level libs into tier_2 list.
Bug #107302 r=blythe sr=alecf
This commit is contained in:
seawood%netscape.com 2002-05-02 22:53:30 +00:00
parent ed6c60e365
commit 7b9cb8e59f
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Makefile.in
View File

@ -49,6 +49,7 @@ ifdef MOZ_ENABLE_XFT
$(MAKE) expat
endif
$(MAKE) tier_1
$(MAKE) tier_2
$(MAKE) tier_9
ifdef MOZ_EXTENSIONS
$(MAKE) tier_94
@ -68,6 +69,7 @@ endif
DIRS = \
$(tier_0_dirs) \
$(tier_1_dirs) \
$(tier_2_dirs) \
$(tier_9_dirs) \
$(NULL)
@ -100,40 +102,52 @@ tier_0_dirs = \
$(NULL)
#
# tier 1 - base libraries
#
tier_1_dirs = js
# tier 1 - 3rd party individual libraries
#
tier_1_dirs += dbm
# MacOSX needs to build lib for MoreFiles before xpcom
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
tier_1_dirs += lib/mac/MoreFiles
ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg
endif
#
# tier 9 - core components (xpcom,necko,gecko)
#
# intl should not be in here - it's just temporary until
# xpconnect's dependency on intl is repaired - see bug 106130
tier_9_dirs += \
modules/libreg \
string \
xpcom \
intl \
$(NULL)
ifndef MOZ_NATIVE_ZLIB
tier_9_dirs += modules/zlib
tier_1_dirs += modules/zlib
endif
# Installer needs standalone libjar, hence standalone zlib
ifneq (,$(filter Linux SunOS WINNT,$(OS_ARCH)))
tier_9_dirs += modules/zlib/standalone
tier_1_dirs += modules/zlib/standalone
endif
tier_9_dirs += \
modules/libjar \
$(NULL)
ifdef MOZ_INTERNAL_LIBART_LGPL
tier_1_dirs += other-licenses/libart_lgpl
endif
#
# tier 2 - base libraries
#
tier_2_dirs = js
# MacOSX needs to build lib for MoreFiles before xpcom
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
tier_2_dirs += lib/mac/MoreFiles
endif
tier_2_dirs += \
modules/libreg \
string \
xpcom \
$(NULL)
#
# tier 9 - core components (necko,gecko)
#
tier_9_dirs += \
js/src/xpconnect \
intl \
modules/libjar \
$(NULL)
ifdef MOZ_JAVA_SUPPLEMENT
tier_9_dirs += \
@ -142,11 +156,7 @@ tier_9_dirs += \
$(NULL)
endif
ifndef MOZ_NATIVE_JPEG
tier_9_dirs += jpeg
endif
tier_9_dirs += dbm js/src/xpconnect
tier_9_dirs += js/src/xpconnect
ifdef MOZ_OJI
tier_9_dirs += js/src/liveconnect
@ -168,10 +178,6 @@ ifdef MOZ_ENABLE_GTK
tier_9_dirs += widget/src/gtksuperwin widget/src/gtkxtbin
endif
ifdef MOZ_INTERNAL_LIBART_LGPL
tier_9_dirs += other-licenses/libart_lgpl
endif
tier_9_dirs += \
modules/libutil \
netwerk \

6
build/unix/modules.mk
View File

@ -66,10 +66,8 @@ BM_CVS_NS_xpidl = xpcom/typelib xpcom/typelib/xpidl
# xpcom
#
BM_DIRS_xpcom = $(BM_DIRS_xpidl) modules/libreg string xpcom
BM_DEP_DIRS_xpcom = intl/unicharutil/public intl/uconv/public modules/libjar
BM_CVS_NS_xpcom = $(BM_CVS_NS_xpidl) xpcom intl/uconv/public
BM_CVS_xpcom = $(BM_CVS_xpidl) modules/libreg xpcom/glue xpcom/base xpcom/ds xpcom/io xpcom/components xpcom/threads xpcom/reflect xpcom/proxy xpcom/build xpcom/tools xpcom/sample xpcom/windbgdlg string modules/libjar intl/unicharutil/public
BM_DIRS_xpcom = $(NSPRPUB_DIR) modules/libreg string xpcom
BM_CVS_xpcom = $(NSPRPUB_DIR) modules/libreg string xpcom
#
# xpconnect