mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-19 01:10:22 +00:00
add REQUIRES support to jpeg, sun-java, db, etc.. b=98371 r=cls
This commit is contained in:
parent
0875f08c1d
commit
8bf5905937
@ -21,7 +21,8 @@
|
||||
|
||||
DEPTH=..\..\..
|
||||
|
||||
MODULE=msgmdb
|
||||
MODULE=mork
|
||||
XPIDL_MODULE=msgmdb
|
||||
|
||||
XPIDLSRCS = \
|
||||
$(NULL)
|
||||
|
@ -23,6 +23,7 @@ DEPTH=..\..\..
|
||||
MODULE = mork
|
||||
LIBRARY_NAME = mork
|
||||
MODULE_NAME = nsMorkModule
|
||||
REQUIRES=xpcom
|
||||
|
||||
################################################################################
|
||||
## exports
|
||||
|
@ -21,8 +21,8 @@
|
||||
|
||||
|
||||
DEPTH=..\..\..
|
||||
MODULE= msgmork
|
||||
|
||||
MODULE= mork
|
||||
REQUIRES = xpcom
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
################################################################################
|
||||
|
@ -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)
|
||||
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -56,6 +56,7 @@ DEPTH= ..\..\..\..
|
||||
MODULE=jsloader
|
||||
LIBRARY_NAME=jsloader
|
||||
MODULE_NAME=JS_component_loader
|
||||
REQUIRES=xpcom string js xpconnect caps dom necko
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -33,6 +33,7 @@ DIRS=standalone
|
||||
MODULE=jar
|
||||
LIBRARY_NAME=jar$(VERSION_NUMBER)
|
||||
MODULE_NAME=nsJarModule
|
||||
REQUIRES= xpcom string caps zlib
|
||||
|
||||
DEPTH=..\..
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
MODULE=jar
|
||||
DEPTH=..\..\..
|
||||
|
||||
REQUIRES=zlib
|
||||
USE_NON_MT_LIBS=1
|
||||
LIBRARY=$(OBJDIR)\jar_s.lib
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -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)
|
||||
|
@ -20,6 +20,7 @@
|
||||
|
||||
DEPTH=..\..\..
|
||||
|
||||
MODULE = mpfilelocprovider
|
||||
EXPORTS = \
|
||||
nsMPFileLocProvider.h \
|
||||
$(NULL)
|
||||
|
@ -20,7 +20,8 @@
|
||||
# Contributor(s):
|
||||
|
||||
DEPTH=..\..\..
|
||||
|
||||
MODULE = mpfilelocprovider
|
||||
REQUIRES=xpcom string
|
||||
LIBRARY_NAME=mpfilelocprovider_s
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
4
netwerk/cache/src/makefile.win
vendored
4
netwerk/cache/src/makefile.win
vendored
@ -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
|
||||
|
||||
|
@ -21,6 +21,7 @@ MODULE = necko
|
||||
|
||||
DEPTH = ..\..\..
|
||||
|
||||
REQUIRES = xpcom string pref
|
||||
LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
|
||||
|
||||
LIBRARY_NAME=neckodns_s
|
||||
|
@ -19,9 +19,9 @@
|
||||
#
|
||||
# Contributor(s):
|
||||
|
||||
MODULE = mime
|
||||
|
||||
DEPTH = ..\..\..
|
||||
MODULE = mimetype
|
||||
|
||||
include <$(DEPTH)/config/config.mak>
|
||||
|
||||
XPIDL_MODULE = mimetype
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -20,6 +20,7 @@
|
||||
MODULE = necko
|
||||
|
||||
DEPTH = ..\..\..\..
|
||||
REQUIRES = xpcom string
|
||||
|
||||
LIBRARY_NAME=nkdata_s
|
||||
|
||||
|
@ -20,6 +20,7 @@
|
||||
MODULE = necko
|
||||
|
||||
DEPTH = ..\..\..\..
|
||||
REQUIRES = xpcom string
|
||||
|
||||
LIBRARY_NAME=nkdatetm_s
|
||||
|
||||
|
@ -21,6 +21,7 @@
|
||||
|
||||
DEPTH=..\..\..\..
|
||||
MODULE=necko
|
||||
REQUIRES = xpcom string exthandler mimetype
|
||||
include <$(DEPTH)/config/config.mak>
|
||||
|
||||
LIBRARY_NAME=nkfile_s
|
||||
|
@ -20,6 +20,7 @@
|
||||
MODULE = necko
|
||||
|
||||
DEPTH = ..\..\..\..
|
||||
REQUIRES = xpcom string mimetype
|
||||
|
||||
LIBRARY_NAME=nkfinger_s
|
||||
|
||||
|
@ -18,6 +18,7 @@
|
||||
# Contributor(s):
|
||||
|
||||
MODULE = necko
|
||||
REQUIRES = xpcom string exthandler mimetype wallet pref intl nkcache
|
||||
|
||||
DEPTH = ..\..\..\..
|
||||
|
||||
|
@ -20,6 +20,7 @@
|
||||
MODULE = necko
|
||||
|
||||
DEPTH = ..\..\..\..
|
||||
REQUIRES = xpcom string mimetype
|
||||
|
||||
LIBRARY_NAME=nkgopher_s
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -21,6 +21,7 @@
|
||||
|
||||
DEPTH=..\..\..\..
|
||||
MODULE=necko
|
||||
REQUIRES = xpcom string jar exthandler mimetype caps js pref xpconnect
|
||||
|
||||
LIBRARY_NAME=nkjar_s
|
||||
|
||||
|
@ -21,6 +21,7 @@
|
||||
|
||||
DEPTH=..\..\..\..
|
||||
MODULE=necko
|
||||
REQUIRES = xpcom string pref
|
||||
|
||||
LIBRARY_NAME=nkkwd_s
|
||||
|
||||
|
@ -21,6 +21,7 @@
|
||||
|
||||
DEPTH=..\..\..\..
|
||||
MODULE=necko
|
||||
REQUIRES = xpcom string exthandler mimetype
|
||||
|
||||
LIBRARY_NAME=nkres_s
|
||||
|
||||
|
@ -23,6 +23,7 @@
|
||||
MODULE = necko
|
||||
|
||||
DEPTH = ..\..\..\..
|
||||
REQUIRES = xpcom string mimetype
|
||||
|
||||
LIBRARY_NAME=nkviewsource_s
|
||||
|
||||
|
@ -20,6 +20,7 @@
|
||||
# Contributor(s):
|
||||
|
||||
MODULE = necko
|
||||
REQUIRES = xpcom string
|
||||
|
||||
DEPTH=..\..\..
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -30,6 +30,7 @@ LLIBS= \
|
||||
|
||||
|
||||
DEPTH=..\..\..
|
||||
REQUIRES = necko xpcom string
|
||||
|
||||
include <$(DEPTH)/config/config.mak>
|
||||
|
||||
|
@ -20,6 +20,7 @@
|
||||
# Contributor(s):
|
||||
|
||||
DEPTH=..\..
|
||||
REQUIRES = xpcom string necko nkcache timer cookie dbm util
|
||||
|
||||
MAKE_OBJ_TYPE = EXE
|
||||
PROG1 = .\$(OBJDIR)\TestFileInput.exe
|
||||
|
@ -42,7 +42,7 @@ DEPTH= ..\..\..
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
INSTALL_DIR=$(XPDIST)\include
|
||||
INSTALL_DIR=$(XPDIST)\include\java
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
|
@ -42,7 +42,7 @@ DEPTH= ..\..\..
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
INSTALL_DIR=$(XPDIST)\include
|
||||
INSTALL_DIR=$(XPDIST)\include\java
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
|
Loading…
x
Reference in New Issue
Block a user