From d0766d027ee403857ee3fd26448cdbd37b4618e1 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Mon, 10 Sep 2001 20:48:38 +0000 Subject: [PATCH] add REQUIRES support to jpeg, sun-java, db, etc.. b=98371 r=cls git-svn-id: svn://10.0.0.236/trunk@102664 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/db/mdb/public/makefile.win | 3 ++- mozilla/db/mork/build/makefile.win | 1 + mozilla/db/mork/src/makefile.win | 4 ++-- mozilla/jpeg/makefile.win | 8 ++++---- mozilla/js/src/liveconnect/makefile.win | 10 +++++++--- mozilla/js/src/makefile.win | 5 +++++ mozilla/js/src/xpconnect/loader/makefile.win | 1 + mozilla/js/src/xpconnect/src/makefile.win | 1 + mozilla/js/src/xpconnect/tests/components/makefile.win | 3 ++- mozilla/js/src/xpconnect/tests/makefile.win | 3 ++- mozilla/modules/libimg/mng/makefile.win | 1 + mozilla/modules/libimg/png/makefile.win | 3 ++- mozilla/modules/libjar/makefile.win | 1 + mozilla/modules/libjar/standalone/makefile.win | 2 +- mozilla/modules/libpref/src/makefile.win | 1 + mozilla/modules/libutil/src/makefile.win | 5 +++-- mozilla/modules/mpfilelocprovider/public/makefile.win | 1 + mozilla/modules/mpfilelocprovider/src/makefile.win | 3 ++- mozilla/modules/oji/src/makefile.win | 5 +++-- mozilla/netwerk/base/src/makefile.win | 1 + mozilla/netwerk/build/makefile.win | 4 +++- mozilla/netwerk/build2/makefile.win | 1 + mozilla/netwerk/cache/src/makefile.win | 4 +++- mozilla/netwerk/dns/src/makefile.win | 1 + mozilla/netwerk/mime/public/makefile.win | 4 ++-- mozilla/netwerk/mime/src/makefile.win | 5 +++-- mozilla/netwerk/protocol/about/src/makefile.win | 4 ++-- mozilla/netwerk/protocol/data/src/makefile.win | 1 + mozilla/netwerk/protocol/datetime/src/makefile.win | 1 + mozilla/netwerk/protocol/file/src/makefile.win | 1 + mozilla/netwerk/protocol/finger/src/makefile.win | 1 + mozilla/netwerk/protocol/ftp/src/makefile.win | 1 + mozilla/netwerk/protocol/gopher/src/makefile.win | 1 + mozilla/netwerk/protocol/http/src/makefile.win | 3 ++- mozilla/netwerk/protocol/jar/src/makefile.win | 1 + mozilla/netwerk/protocol/keyword/src/makefile.win | 1 + mozilla/netwerk/protocol/res/src/makefile.win | 1 + mozilla/netwerk/protocol/viewsource/src/makefile.win | 1 + mozilla/netwerk/socket/base/makefile.win | 1 + mozilla/netwerk/streamconv/converters/makefile.win | 3 ++- mozilla/netwerk/streamconv/src/makefile.win | 5 +++-- mozilla/netwerk/streamconv/test/makefile.win | 1 + mozilla/netwerk/test/makefile.win | 1 + mozilla/sun-java/stubs/include/makefile.win | 2 +- mozilla/sun-java/stubs/jri/makefile.win | 2 +- 45 files changed, 80 insertions(+), 33 deletions(-) diff --git a/mozilla/db/mdb/public/makefile.win b/mozilla/db/mdb/public/makefile.win index c3e11726a05..8670bc61a1a 100644 --- a/mozilla/db/mdb/public/makefile.win +++ b/mozilla/db/mdb/public/makefile.win @@ -21,7 +21,8 @@ DEPTH=..\..\.. -MODULE=msgmdb +MODULE=mork +XPIDL_MODULE=msgmdb XPIDLSRCS = \ $(NULL) diff --git a/mozilla/db/mork/build/makefile.win b/mozilla/db/mork/build/makefile.win index c72c3fbf5f8..b0c0c271f03 100644 --- a/mozilla/db/mork/build/makefile.win +++ b/mozilla/db/mork/build/makefile.win @@ -23,6 +23,7 @@ DEPTH=..\..\.. MODULE = mork LIBRARY_NAME = mork MODULE_NAME = nsMorkModule +REQUIRES=xpcom ################################################################################ ## exports diff --git a/mozilla/db/mork/src/makefile.win b/mozilla/db/mork/src/makefile.win index 2c5427d1b98..19c2cbe2cd9 100644 --- a/mozilla/db/mork/src/makefile.win +++ b/mozilla/db/mork/src/makefile.win @@ -21,8 +21,8 @@ DEPTH=..\..\.. -MODULE= msgmork - +MODULE= mork +REQUIRES = xpcom include <$(DEPTH)\config\config.mak> ################################################################################ diff --git a/mozilla/jpeg/makefile.win b/mozilla/jpeg/makefile.win index b9dfc8428bb..d24aede1636 100644 --- a/mozilla/jpeg/makefile.win +++ b/mozilla/jpeg/makefile.win @@ -60,7 +60,7 @@ DEFFILE=jpg$(MOZ_BIGS)$(VERSION_NUMBER).def #// (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS) #// -Zi -GM needed to compile mmx functions in assembly. LCFLAGS = -Zi -GM -LINCS = -I$(PUBLIC)/java +LINCS = -I$(XPDIST)\include #//------------------------------------------------------------------------ #// @@ -96,8 +96,8 @@ JPEG_OBJS= .\$(OBJDIR)\jdapimin.obj \ .\$(OBJDIR)\jfdctflt.obj \ .\$(OBJDIR)\jfdctfst.obj \ .\$(OBJDIR)\jfdctint.obj \ - .\$(OBJDIR)\jcapimin.obj \ - .\$(OBJDIR)\jcparam.obj \ + .\$(OBJDIR)\jcapimin.obj \ + .\$(OBJDIR)\jcparam.obj \ .\$(OBJDIR)\jcapistd.obj \ .\$(OBJDIR)\jcmarker.obj \ .\$(OBJDIR)\jcinit.obj \ @@ -109,7 +109,7 @@ JPEG_OBJS= .\$(OBJDIR)\jdapimin.obj \ .\$(OBJDIR)\jccolor.obj \ .\$(OBJDIR)\jcphuff.obj \ .\$(OBJDIR)\jcdctmgr.obj \ - .\$(OBJDIR)\jcprepct.obj \ + .\$(OBJDIR)\jcprepct.obj \ $(NULL) diff --git a/mozilla/js/src/liveconnect/makefile.win b/mozilla/js/src/liveconnect/makefile.win index f39e6ba4e50..cd26bf0038c 100644 --- a/mozilla/js/src/liveconnect/makefile.win +++ b/mozilla/js/src/liveconnect/makefile.win @@ -45,7 +45,8 @@ #// #//------------------------------------------------------------------------ DEPTH= ..\..\.. - +MODULE = java +REQUIRES=xpcom js xpconnect include <$(DEPTH)/config/config.mak> !ifdef NSJVM @@ -107,7 +108,11 @@ OBJS= \ #// install headers #// #//------------------------------------------------------------------------ +!ifdef MOZ_TRACK_MODULE_DEPS +INSTALL_DIR=$(XPDIST)\include\$(MODULE) +!else INSTALL_DIR=$(XPDIST)\include +!endif INSTALL_FILE_LIST= \ jsjava.h \ !ifdef MOZ_OJI @@ -131,9 +136,8 @@ JNI_GEN= \ !endif -MODULE = java EXPORTS = \ - $(JNI_GEN_DIR)\netscape_javascript_JSObject.h \ + $(JNI_GEN_DIR)\netscape_javascript_JSObject.h \ $(NULL) diff --git a/mozilla/js/src/makefile.win b/mozilla/js/src/makefile.win index 75e1e5867ef..0e8484e1104 100644 --- a/mozilla/js/src/makefile.win +++ b/mozilla/js/src/makefile.win @@ -36,6 +36,7 @@ #// #//------------------------------------------------------------------------ DEPTH=..\.. +MODULE=js include <$(DEPTH)\config\config.mak> !ifdef MOZ_OJI @@ -130,7 +131,11 @@ OBJS = \ #// install headers #// #//------------------------------------------------------------------------ +!ifdef MOZ_TRACK_MODULE_DEPS +INSTALL_DIR=$(XPDIST)\include\$(MODULE) +!else INSTALL_DIR=$(XPDIST)\include +!endif INSTALL_FILE_LIST= \ js.msg \ jsapi.h \ diff --git a/mozilla/js/src/xpconnect/loader/makefile.win b/mozilla/js/src/xpconnect/loader/makefile.win index 9f9a022525b..89a527bb6ab 100755 --- a/mozilla/js/src/xpconnect/loader/makefile.win +++ b/mozilla/js/src/xpconnect/loader/makefile.win @@ -56,6 +56,7 @@ DEPTH= ..\..\..\.. MODULE=jsloader LIBRARY_NAME=jsloader MODULE_NAME=JS_component_loader +REQUIRES=xpcom string js xpconnect caps dom necko #//------------------------------------------------------------------------ #// diff --git a/mozilla/js/src/xpconnect/src/makefile.win b/mozilla/js/src/xpconnect/src/makefile.win index 1e5712a9f38..38b69c887f2 100644 --- a/mozilla/js/src/xpconnect/src/makefile.win +++ b/mozilla/js/src/xpconnect/src/makefile.win @@ -37,6 +37,7 @@ DEPTH=..\..\..\.. MODULE=xpconnect LIBRARY_NAME=xpc$(MOZ_BITS)$(VERSION_NUMBER) MODULE_NAME=xpconnect +REQUIRES=xpcom string js dom caps #PDBFILE = $(DLLNAME).pdb #MAPFILE = $(DLLNAME).map diff --git a/mozilla/js/src/xpconnect/tests/components/makefile.win b/mozilla/js/src/xpconnect/tests/components/makefile.win index c15b6bdc8a3..7501ae0fc83 100644 --- a/mozilla/js/src/xpconnect/tests/components/makefile.win +++ b/mozilla/js/src/xpconnect/tests/components/makefile.win @@ -38,7 +38,8 @@ MAKE_OBJ_TYPE = DLL DLLNAME = xpctest DLL =.\$(OBJDIR)\$(DLLNAME).dll -MODULE=xpconnect +MODULE=xpconnect_tests +REQUIRES=xpcom string xpconnect js timer DEFINES=-DWIN32_LEAN_AND_MEAN diff --git a/mozilla/js/src/xpconnect/tests/makefile.win b/mozilla/js/src/xpconnect/tests/makefile.win index cfe92d31979..d0d96f97df7 100644 --- a/mozilla/js/src/xpconnect/tests/makefile.win +++ b/mozilla/js/src/xpconnect/tests/makefile.win @@ -36,7 +36,8 @@ DEPTH=..\..\..\.. DIRS = idl components - +MODULE=xpconnect_tests +REQUIRES = xpcom string js xpconnect MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestXPC.exe PROGRAMS = $(PROG1) diff --git a/mozilla/modules/libimg/mng/makefile.win b/mozilla/modules/libimg/mng/makefile.win index 126d10d61e5..ecbbc39dbf9 100644 --- a/mozilla/modules/libimg/mng/makefile.win +++ b/mozilla/modules/libimg/mng/makefile.win @@ -37,6 +37,7 @@ LCFLAGS = $(LCFLAGS) -DDEBUG_GC EXPORTS = libmng.h libmng_conf.h libmng_types.h MODULE=mng +REQUIRES=zlib jpeg DEPTH=..\..\.. LOCAL_INCLUDES=-I. LIBRARY_NAME=mng diff --git a/mozilla/modules/libimg/png/makefile.win b/mozilla/modules/libimg/png/makefile.win index c4c6eb0d72e..0800c08934e 100644 --- a/mozilla/modules/libimg/png/makefile.win +++ b/mozilla/modules/libimg/png/makefile.win @@ -36,7 +36,8 @@ LCFLAGS = $(LCFLAGS) -DDEBUG_GC EXPORTS = png.h pngconf.h -MODULE=png +MODULE=png +REQUIRES=zlib DEPTH=..\..\.. LOCAL_INCLUDES=-I. LIBRARY_NAME=png diff --git a/mozilla/modules/libjar/makefile.win b/mozilla/modules/libjar/makefile.win index b0926f126ac..fa68cdef598 100644 --- a/mozilla/modules/libjar/makefile.win +++ b/mozilla/modules/libjar/makefile.win @@ -33,6 +33,7 @@ DIRS=standalone MODULE=jar LIBRARY_NAME=jar$(VERSION_NUMBER) MODULE_NAME=nsJarModule +REQUIRES= xpcom string caps zlib DEPTH=..\.. diff --git a/mozilla/modules/libjar/standalone/makefile.win b/mozilla/modules/libjar/standalone/makefile.win index 4ea671ae9b8..d8e209ee080 100644 --- a/mozilla/modules/libjar/standalone/makefile.win +++ b/mozilla/modules/libjar/standalone/makefile.win @@ -24,7 +24,7 @@ MODULE=jar DEPTH=..\..\.. - +REQUIRES=zlib USE_NON_MT_LIBS=1 LIBRARY=$(OBJDIR)\jar_s.lib diff --git a/mozilla/modules/libpref/src/makefile.win b/mozilla/modules/libpref/src/makefile.win index f50fc90d0b9..e7013f91c81 100644 --- a/mozilla/modules/libpref/src/makefile.win +++ b/mozilla/modules/libpref/src/makefile.win @@ -40,6 +40,7 @@ DEPTH = ..\..\.. MODULE = pref LIBRARY_NAME = xppref$(MOZ_BITS) MODULE_NAME = nsPrefModule +REQUIRES = xpcom string js xpconnect caps intl timer necko embedcomponents profile LINCS = -I$(PUBLIC)/js \ -I$(PUBLIC)/pref \ diff --git a/mozilla/modules/libutil/src/makefile.win b/mozilla/modules/libutil/src/makefile.win index 343fe112ce5..1a372902930 100644 --- a/mozilla/modules/libutil/src/makefile.win +++ b/mozilla/modules/libutil/src/makefile.win @@ -29,9 +29,10 @@ CPPSRCS=stopwatch.cpp \ CPP_OBJS=.\$(OBJDIR)\stopwatch.obj \ $(NULL) -C_OBJS=.\$(OBJDIR)\obs.obj - +C_OBJS=.\$(OBJDIR)\obs.obj +LINCS=-I$(DEPTH)\include +REQUIRES=xpcom !include $(DEPTH)\config\rules.mak install:: $(LIBRARY) diff --git a/mozilla/modules/mpfilelocprovider/public/makefile.win b/mozilla/modules/mpfilelocprovider/public/makefile.win index 448767055ed..2b99ab810d2 100755 --- a/mozilla/modules/mpfilelocprovider/public/makefile.win +++ b/mozilla/modules/mpfilelocprovider/public/makefile.win @@ -20,6 +20,7 @@ DEPTH=..\..\.. +MODULE = mpfilelocprovider EXPORTS = \ nsMPFileLocProvider.h \ $(NULL) diff --git a/mozilla/modules/mpfilelocprovider/src/makefile.win b/mozilla/modules/mpfilelocprovider/src/makefile.win index 74d7018fb4f..ba5fc068409 100755 --- a/mozilla/modules/mpfilelocprovider/src/makefile.win +++ b/mozilla/modules/mpfilelocprovider/src/makefile.win @@ -20,7 +20,8 @@ # Contributor(s): DEPTH=..\..\.. - +MODULE = mpfilelocprovider +REQUIRES=xpcom string LIBRARY_NAME=mpfilelocprovider_s diff --git a/mozilla/modules/oji/src/makefile.win b/mozilla/modules/oji/src/makefile.win index 962198681eb..dc3300549c4 100644 --- a/mozilla/modules/oji/src/makefile.win +++ b/mozilla/modules/oji/src/makefile.win @@ -14,11 +14,12 @@ #//------------------------------------------------------------------------ DEPTH= ..\..\.. -include <$(DEPTH)/config/config.mak> -MODULE=ojiimpl +MODULE=oji LIBRARY_NAME=oji MODULE_NAME=nsCJVMManagerModule +REQUIRES = xpcom string java js plugin gkplugin caps pref js jar necko dom widget xpconnect windowwatcher layout docshell webBrowser_core intl gfx +include <$(DEPTH)/config/config.mak> !ifdef MOZ_OJI diff --git a/mozilla/netwerk/base/src/makefile.win b/mozilla/netwerk/base/src/makefile.win index 594964d77f3..3eccdbc37f2 100644 --- a/mozilla/netwerk/base/src/makefile.win +++ b/mozilla/netwerk/base/src/makefile.win @@ -20,6 +20,7 @@ MODULE = necko DEPTH = ..\..\.. +REQUIRES = xpcom string exthandler mimetype intl pref include <$(DEPTH)/config/config.mak> LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET diff --git a/mozilla/netwerk/build/makefile.win b/mozilla/netwerk/build/makefile.win index 4ae130bda5f..8e3c7e3ce9a 100644 --- a/mozilla/netwerk/build/makefile.win +++ b/mozilla/netwerk/build/makefile.win @@ -20,11 +20,13 @@ # Contributor(s): DEPTH=..\.. -include <$(DEPTH)/config/config.mak> MODULE = necko LIBRARY_NAME = necko MODULE_NAME = necko_core_and_primary_protocols +REQUIRES = xpcom string nkcache pref mimetype util jar locale intl zlib + +include <$(DEPTH)/config/config.mak> LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET diff --git a/mozilla/netwerk/build2/makefile.win b/mozilla/netwerk/build2/makefile.win index 004909bfc93..ff07569e116 100644 --- a/mozilla/netwerk/build2/makefile.win +++ b/mozilla/netwerk/build2/makefile.win @@ -24,6 +24,7 @@ DEPTH=..\.. MODULE = necko LIBRARY_NAME = necko2 MODULE_NAME = necko_secondary_protocols +REQUIRES = xpcom string nkcache LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET diff --git a/mozilla/netwerk/cache/src/makefile.win b/mozilla/netwerk/cache/src/makefile.win index 346cb36d89e..12549c0eae7 100755 --- a/mozilla/netwerk/cache/src/makefile.win +++ b/mozilla/netwerk/cache/src/makefile.win @@ -20,11 +20,13 @@ # DEPTH = ..\..\.. -include <$(DEPTH)/config/config.mak> MODULE = nkcache LIBRARY_NAME = nkcache MODULE_NAME = cacheservice +REQUIRES = xpcom string necko pref + +include <$(DEPTH)/config/config.mak> LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET diff --git a/mozilla/netwerk/dns/src/makefile.win b/mozilla/netwerk/dns/src/makefile.win index 258bea50b9d..4a1ccec7fef 100644 --- a/mozilla/netwerk/dns/src/makefile.win +++ b/mozilla/netwerk/dns/src/makefile.win @@ -21,6 +21,7 @@ MODULE = necko DEPTH = ..\..\.. +REQUIRES = xpcom string pref LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET LIBRARY_NAME=neckodns_s diff --git a/mozilla/netwerk/mime/public/makefile.win b/mozilla/netwerk/mime/public/makefile.win index 84b8525bc8a..36da163ece2 100644 --- a/mozilla/netwerk/mime/public/makefile.win +++ b/mozilla/netwerk/mime/public/makefile.win @@ -19,9 +19,9 @@ # # Contributor(s): -MODULE = mime - DEPTH = ..\..\.. +MODULE = mimetype + include <$(DEPTH)/config/config.mak> XPIDL_MODULE = mimetype diff --git a/mozilla/netwerk/mime/src/makefile.win b/mozilla/netwerk/mime/src/makefile.win index 3dbab823ae7..e1e84cffe27 100644 --- a/mozilla/netwerk/mime/src/makefile.win +++ b/mozilla/netwerk/mime/src/makefile.win @@ -18,9 +18,10 @@ # Contributor(s): DEPTH = ..\..\.. -include <$(DEPTH)/config/config.mak> +MODULE = mimetype +REQUIRES = xpcom string necko pref -MODULE = necko +include <$(DEPTH)/config/config.mak> LIBRARY_NAME = nkmime_s diff --git a/mozilla/netwerk/protocol/about/src/makefile.win b/mozilla/netwerk/protocol/about/src/makefile.win index c30ba00e86f..30e40a6abb3 100644 --- a/mozilla/netwerk/protocol/about/src/makefile.win +++ b/mozilla/netwerk/protocol/about/src/makefile.win @@ -20,9 +20,9 @@ # Contributor(s): DEPTH=..\..\..\.. -include <$(DEPTH)/config/config.mak> - MODULE=necko +REQUIRES = xpcom string nkcache caps xpconnect js +include <$(DEPTH)/config/config.mak> LIBRARY_NAME=nkabout_s diff --git a/mozilla/netwerk/protocol/data/src/makefile.win b/mozilla/netwerk/protocol/data/src/makefile.win index 899ce157e2c..f73f9dd1611 100644 --- a/mozilla/netwerk/protocol/data/src/makefile.win +++ b/mozilla/netwerk/protocol/data/src/makefile.win @@ -20,6 +20,7 @@ MODULE = necko DEPTH = ..\..\..\.. +REQUIRES = xpcom string LIBRARY_NAME=nkdata_s diff --git a/mozilla/netwerk/protocol/datetime/src/makefile.win b/mozilla/netwerk/protocol/datetime/src/makefile.win index f00b3b4e4cf..52ae45a6b47 100644 --- a/mozilla/netwerk/protocol/datetime/src/makefile.win +++ b/mozilla/netwerk/protocol/datetime/src/makefile.win @@ -20,6 +20,7 @@ MODULE = necko DEPTH = ..\..\..\.. +REQUIRES = xpcom string LIBRARY_NAME=nkdatetm_s diff --git a/mozilla/netwerk/protocol/file/src/makefile.win b/mozilla/netwerk/protocol/file/src/makefile.win index 5d8ab2dc226..5df0b4ac5dd 100644 --- a/mozilla/netwerk/protocol/file/src/makefile.win +++ b/mozilla/netwerk/protocol/file/src/makefile.win @@ -21,6 +21,7 @@ DEPTH=..\..\..\.. MODULE=necko +REQUIRES = xpcom string exthandler mimetype include <$(DEPTH)/config/config.mak> LIBRARY_NAME=nkfile_s diff --git a/mozilla/netwerk/protocol/finger/src/makefile.win b/mozilla/netwerk/protocol/finger/src/makefile.win index ce07b017640..49ed345026b 100644 --- a/mozilla/netwerk/protocol/finger/src/makefile.win +++ b/mozilla/netwerk/protocol/finger/src/makefile.win @@ -20,6 +20,7 @@ MODULE = necko DEPTH = ..\..\..\.. +REQUIRES = xpcom string mimetype LIBRARY_NAME=nkfinger_s diff --git a/mozilla/netwerk/protocol/ftp/src/makefile.win b/mozilla/netwerk/protocol/ftp/src/makefile.win index e7d2958c205..5328d5b05d7 100644 --- a/mozilla/netwerk/protocol/ftp/src/makefile.win +++ b/mozilla/netwerk/protocol/ftp/src/makefile.win @@ -18,6 +18,7 @@ # Contributor(s): MODULE = necko +REQUIRES = xpcom string exthandler mimetype wallet pref intl nkcache DEPTH = ..\..\..\.. diff --git a/mozilla/netwerk/protocol/gopher/src/makefile.win b/mozilla/netwerk/protocol/gopher/src/makefile.win index fa69b025a61..8e01175fbd7 100644 --- a/mozilla/netwerk/protocol/gopher/src/makefile.win +++ b/mozilla/netwerk/protocol/gopher/src/makefile.win @@ -20,6 +20,7 @@ MODULE = necko DEPTH = ..\..\..\.. +REQUIRES = xpcom string mimetype LIBRARY_NAME=nkgopher_s diff --git a/mozilla/netwerk/protocol/http/src/makefile.win b/mozilla/netwerk/protocol/http/src/makefile.win index dd134b8244b..ecec756c361 100644 --- a/mozilla/netwerk/protocol/http/src/makefile.win +++ b/mozilla/netwerk/protocol/http/src/makefile.win @@ -20,9 +20,10 @@ # Contributor(s): DEPTH=..\..\..\.. +MODULE=necko +REQUIRES = xpcom string pref nkcache mimetype intl exthandler include <$(DEPTH)/config/config.mak> -MODULE=necko LIBRARY_NAME=nkhttp_s diff --git a/mozilla/netwerk/protocol/jar/src/makefile.win b/mozilla/netwerk/protocol/jar/src/makefile.win index aebc2b98ad4..64360819ccc 100644 --- a/mozilla/netwerk/protocol/jar/src/makefile.win +++ b/mozilla/netwerk/protocol/jar/src/makefile.win @@ -21,6 +21,7 @@ DEPTH=..\..\..\.. MODULE=necko +REQUIRES = xpcom string jar exthandler mimetype caps js pref xpconnect LIBRARY_NAME=nkjar_s diff --git a/mozilla/netwerk/protocol/keyword/src/makefile.win b/mozilla/netwerk/protocol/keyword/src/makefile.win index 27e0fc5d8b8..09daaaab03e 100644 --- a/mozilla/netwerk/protocol/keyword/src/makefile.win +++ b/mozilla/netwerk/protocol/keyword/src/makefile.win @@ -21,6 +21,7 @@ DEPTH=..\..\..\.. MODULE=necko +REQUIRES = xpcom string pref LIBRARY_NAME=nkkwd_s diff --git a/mozilla/netwerk/protocol/res/src/makefile.win b/mozilla/netwerk/protocol/res/src/makefile.win index f9af931aa48..376fef3eaef 100644 --- a/mozilla/netwerk/protocol/res/src/makefile.win +++ b/mozilla/netwerk/protocol/res/src/makefile.win @@ -21,6 +21,7 @@ DEPTH=..\..\..\.. MODULE=necko +REQUIRES = xpcom string exthandler mimetype LIBRARY_NAME=nkres_s diff --git a/mozilla/netwerk/protocol/viewsource/src/makefile.win b/mozilla/netwerk/protocol/viewsource/src/makefile.win index 43f484ea78b..ea244988c7b 100644 --- a/mozilla/netwerk/protocol/viewsource/src/makefile.win +++ b/mozilla/netwerk/protocol/viewsource/src/makefile.win @@ -23,6 +23,7 @@ MODULE = necko DEPTH = ..\..\..\.. +REQUIRES = xpcom string mimetype LIBRARY_NAME=nkviewsource_s diff --git a/mozilla/netwerk/socket/base/makefile.win b/mozilla/netwerk/socket/base/makefile.win index 4152d13d257..aa97d46300e 100644 --- a/mozilla/netwerk/socket/base/makefile.win +++ b/mozilla/netwerk/socket/base/makefile.win @@ -20,6 +20,7 @@ # Contributor(s): MODULE = necko +REQUIRES = xpcom string DEPTH=..\..\.. diff --git a/mozilla/netwerk/streamconv/converters/makefile.win b/mozilla/netwerk/streamconv/converters/makefile.win index 2fe6950fd72..812504473da 100644 --- a/mozilla/netwerk/streamconv/converters/makefile.win +++ b/mozilla/netwerk/streamconv/converters/makefile.win @@ -18,9 +18,10 @@ # Contributor(s): DEPTH = ..\..\.. -include <$(DEPTH)/config/config.mak> MODULE = necko +REQUIRES = xpcom string mimetype locale util pref exthandler zlib +include <$(DEPTH)/config/config.mak> LIBRARY_NAME=nkcnvts_s diff --git a/mozilla/netwerk/streamconv/src/makefile.win b/mozilla/netwerk/streamconv/src/makefile.win index 893511b5387..1daa6ff48eb 100644 --- a/mozilla/netwerk/streamconv/src/makefile.win +++ b/mozilla/netwerk/streamconv/src/makefile.win @@ -18,9 +18,10 @@ # Contributor(s): DEPTH = ..\..\.. -include <$(DEPTH)/config/config.mak> - MODULE = necko +REQUIRES = xpcom string + +include <$(DEPTH)/config/config.mak> LIBRARY_NAME=nkconv_s diff --git a/mozilla/netwerk/streamconv/test/makefile.win b/mozilla/netwerk/streamconv/test/makefile.win index 233c35da4d7..9fc33aff3a2 100644 --- a/mozilla/netwerk/streamconv/test/makefile.win +++ b/mozilla/netwerk/streamconv/test/makefile.win @@ -30,6 +30,7 @@ LLIBS= \ DEPTH=..\..\.. +REQUIRES = necko xpcom string include <$(DEPTH)/config/config.mak> diff --git a/mozilla/netwerk/test/makefile.win b/mozilla/netwerk/test/makefile.win index 7cd4a8dce45..ba8fdb8bf8a 100644 --- a/mozilla/netwerk/test/makefile.win +++ b/mozilla/netwerk/test/makefile.win @@ -20,6 +20,7 @@ # Contributor(s): DEPTH=..\.. +REQUIRES = xpcom string necko nkcache timer cookie dbm util MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestFileInput.exe diff --git a/mozilla/sun-java/stubs/include/makefile.win b/mozilla/sun-java/stubs/include/makefile.win index aa1a9d5c376..54c2c9b0775 100644 --- a/mozilla/sun-java/stubs/include/makefile.win +++ b/mozilla/sun-java/stubs/include/makefile.win @@ -42,7 +42,7 @@ DEPTH= ..\..\.. #// #//------------------------------------------------------------------------ -INSTALL_DIR=$(XPDIST)\include +INSTALL_DIR=$(XPDIST)\include\java #//------------------------------------------------------------------------ diff --git a/mozilla/sun-java/stubs/jri/makefile.win b/mozilla/sun-java/stubs/jri/makefile.win index d84aa510af2..bc23b5627a8 100644 --- a/mozilla/sun-java/stubs/jri/makefile.win +++ b/mozilla/sun-java/stubs/jri/makefile.win @@ -42,7 +42,7 @@ DEPTH= ..\..\.. #// #//------------------------------------------------------------------------ -INSTALL_DIR=$(XPDIST)\include +INSTALL_DIR=$(XPDIST)\include\java #//------------------------------------------------------------------------