From 8b23f45a94d00d1596053ade97e839721cfbba4c Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Mon, 10 Sep 2001 20:03:25 +0000 Subject: [PATCH] add REQUIRES support to intl b=98371 r=cls --- intl/chardet/src/makefile.win | 1 + intl/chardet/tests/makefile.win | 2 +- intl/compatibility/src/makefile.win | 1 + intl/locale/src/makefile.win | 1 + intl/locale/src/windows/makefile.win | 1 + intl/lwbrk/src/makefile.win | 1 + intl/strres/src/makefile.win | 1 + intl/uconv/src/makefile.win | 1 + intl/uconv/tests/makefile.win | 2 +- intl/uconv/ucvcn/makefile.win | 1 + intl/uconv/ucvibm/makefile.win | 1 + intl/uconv/ucvja/makefile.win | 1 + intl/uconv/ucvko/makefile.win | 1 + intl/uconv/ucvlatin/makefile.win | 1 + intl/uconv/ucvtw/makefile.win | 1 + intl/uconv/ucvtw2/makefile.win | 1 + intl/unicharutil/src/makefile.win | 1 + 17 files changed, 17 insertions(+), 2 deletions(-) diff --git a/intl/chardet/src/makefile.win b/intl/chardet/src/makefile.win index 878a6c2e5f9..f50a48e5a51 100644 --- a/intl/chardet/src/makefile.win +++ b/intl/chardet/src/makefile.win @@ -62,6 +62,7 @@ CPP_OBJS= \ MODULE=chardet LIBARARY_NAME=chardet MODULE_NAME=nsCharDetModule +REQUIRES = xpcom string uconv webshell uriloader docshell htmlparser dom necko widget layout embedcomponents raptor content INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\chardet -I$(PUBLIC)\raptor \ -I$(PUBLIC)\netlib -I$(PUBLIC)\uconv -I$(PUBLIC)\webshell diff --git a/intl/chardet/tests/makefile.win b/intl/chardet/tests/makefile.win index 010b8865604..396eec715c2 100644 --- a/intl/chardet/tests/makefile.win +++ b/intl/chardet/tests/makefile.win @@ -26,7 +26,7 @@ DEPTH = ..\..\.. MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\DetectCharset.exe PROGRAMS = $(PROG1) - +REQUIRES=chardet LCFLAGS=-DUSE_NSREG diff --git a/intl/compatibility/src/makefile.win b/intl/compatibility/src/makefile.win index faa4ce1902f..bc68340dc1c 100644 --- a/intl/compatibility/src/makefile.win +++ b/intl/compatibility/src/makefile.win @@ -40,6 +40,7 @@ CPP_OBJS= \ MODULE=intlcmpt LIBRARY_NAME=intlcmpt MODULE_NAME=I18nCompatibility +REQUIRES=xpcom string INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor diff --git a/intl/locale/src/makefile.win b/intl/locale/src/makefile.win index 0f94f9d81dc..01a67a98415 100644 --- a/intl/locale/src/makefile.win +++ b/intl/locale/src/makefile.win @@ -27,6 +27,7 @@ DEPTH = ..\..\.. DEFINES = -D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE = locale +REQUIRES = xpcom string uconv unicharutil necko dom windowwatcher uriloader intl LIBRARY_NAME = nslocale_s DIRS = windows diff --git a/intl/locale/src/windows/makefile.win b/intl/locale/src/windows/makefile.win index 4f1b4bcd3ce..0e7ef333b34 100644 --- a/intl/locale/src/windows/makefile.win +++ b/intl/locale/src/windows/makefile.win @@ -20,6 +20,7 @@ # Contributor(s): DEPTH=..\..\..\.. +REQUIRES=xpcom string include <$(DEPTH)/config/config.mak> MODULE = nslocale diff --git a/intl/lwbrk/src/makefile.win b/intl/lwbrk/src/makefile.win index fe1347455aa..e1e4aa6ab78 100644 --- a/intl/lwbrk/src/makefile.win +++ b/intl/lwbrk/src/makefile.win @@ -51,6 +51,7 @@ CPP_OBJS= \ MODULE=lwbrk LIBRARY_NAME=lwbrk MODULE_NAME=nsLWBrkModule +REQUIRES=xpcom string INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\lwbrk -I$(PUBLIC)\raptor diff --git a/intl/strres/src/makefile.win b/intl/strres/src/makefile.win index 38e3368a3be..1fd4388e847 100644 --- a/intl/strres/src/makefile.win +++ b/intl/strres/src/makefile.win @@ -21,6 +21,7 @@ DEPTH=..\..\.. +REQUIRES = xpcom string necko locale include <$(DEPTH)\config\config.mak> LIBRARY_NAME=strres diff --git a/intl/uconv/src/makefile.win b/intl/uconv/src/makefile.win index f6b09ada81d..994436aa689 100644 --- a/intl/uconv/src/makefile.win +++ b/intl/uconv/src/makefile.win @@ -20,6 +20,7 @@ # Contributor(s): DEPTH=..\..\.. +REQUIRES = xpcom string intl locale chardet necko rdf pref include <$(DEPTH)/config/config.mak> DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN diff --git a/intl/uconv/tests/makefile.win b/intl/uconv/tests/makefile.win index fdbb537b8d5..4b3f7d3e5f1 100644 --- a/intl/uconv/tests/makefile.win +++ b/intl/uconv/tests/makefile.win @@ -20,7 +20,7 @@ # Contributor(s): DEPTH = ..\..\.. - +REQUIRES = uconv string MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\convperf.exe diff --git a/intl/uconv/ucvcn/makefile.win b/intl/uconv/ucvcn/makefile.win index e578b923363..c0792eff5a7 100644 --- a/intl/uconv/ucvcn/makefile.win +++ b/intl/uconv/ucvcn/makefile.win @@ -24,6 +24,7 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv +REQUIRES=xpcom string uconv LIBRARY_NAME=ucvcn MODULE_NAME=nsUCvCnModule diff --git a/intl/uconv/ucvibm/makefile.win b/intl/uconv/ucvibm/makefile.win index 05317165cc6..9276208d1f9 100644 --- a/intl/uconv/ucvibm/makefile.win +++ b/intl/uconv/ucvibm/makefile.win @@ -36,6 +36,7 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv +REQUIRES=xpcom string uconv LIBRARY_NAME=ucvibm MODULE_NAME=nsUCvIBMModule diff --git a/intl/uconv/ucvja/makefile.win b/intl/uconv/ucvja/makefile.win index 3bc42028d07..8459569eb95 100644 --- a/intl/uconv/ucvja/makefile.win +++ b/intl/uconv/ucvja/makefile.win @@ -24,6 +24,7 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv +REQUIRES=xpcom string uconv LIBRARY_NAME=ucvja MODULE_NAME=nsUCvJAModule diff --git a/intl/uconv/ucvko/makefile.win b/intl/uconv/ucvko/makefile.win index aa95a794b1b..cf8ed22af35 100644 --- a/intl/uconv/ucvko/makefile.win +++ b/intl/uconv/ucvko/makefile.win @@ -24,6 +24,7 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv +REQUIRES=xpcom string uconv LIBRARY_NAME=ucvko MODULE_NAME=nsUCvKoModule diff --git a/intl/uconv/ucvlatin/makefile.win b/intl/uconv/ucvlatin/makefile.win index c071b278899..7cd6d1f196a 100644 --- a/intl/uconv/ucvlatin/makefile.win +++ b/intl/uconv/ucvlatin/makefile.win @@ -26,6 +26,7 @@ DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv LIBRARY_NAME=ucvlatin MODULE_NAME=nsUCvLatinModule +REQUIRES = xpcom string uconv CPPSRCS = \ nsUEscapeToUnicode.cpp \ diff --git a/intl/uconv/ucvtw/makefile.win b/intl/uconv/ucvtw/makefile.win index f9826bcdf2c..ea5b09137bd 100644 --- a/intl/uconv/ucvtw/makefile.win +++ b/intl/uconv/ucvtw/makefile.win @@ -24,6 +24,7 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv +REQUIRES=xpcom string uconv LIBRARY_NAME=ucvtw MODULE_NAME=nsUCvTWModule diff --git a/intl/uconv/ucvtw2/makefile.win b/intl/uconv/ucvtw2/makefile.win index 3e9bc80da53..0a717e41b34 100644 --- a/intl/uconv/ucvtw2/makefile.win +++ b/intl/uconv/ucvtw2/makefile.win @@ -24,6 +24,7 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv +REQUIRES=xpcom string uconv LIBRARY_NAME=ucvtw2 MODULE_NAME=nsUCvTW2Module diff --git a/intl/unicharutil/src/makefile.win b/intl/unicharutil/src/makefile.win index 6b3f670f684..1b185ab4245 100644 --- a/intl/unicharutil/src/makefile.win +++ b/intl/unicharutil/src/makefile.win @@ -19,6 +19,7 @@ # # Contributor(s): DEPTH=..\..\.. +REQUIRES = xpcom string uconv necko include <$(DEPTH)\config\config.mak>