Sync'd Makefile.ins
git-svn-id: svn://10.0.0.236/trunk@9074 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
#
|
||||
######################################################################
|
||||
#
|
||||
# Makefile for tubbed-out FE, modeled after XFE Makefile.
|
||||
# Makefile for stubbed-out FE, modeled after XFE Makefile.
|
||||
#
|
||||
|
||||
DEPTH = ../..
|
||||
@@ -394,7 +394,7 @@ DEFINES += -DNEW_DECODERS
|
||||
#
|
||||
|
||||
ifdef BUILD_OFFICIAL
|
||||
EXTRA_REL_FILES += $(DIST)/bin/vreg $(srcdir)/l10n/us/xp/bookmark.htm
|
||||
EXTRA_REL_FILES += $(DIST)/bin/vreg $(topsrcdir)/l10n/us/xp/bookmark.htm
|
||||
endif
|
||||
|
||||
# Only SunOS4 needs two versions NIS and DNS.
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
|
||||
DEPTH = ..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
@@ -29,7 +29,7 @@ CSRCS = nsinstall.c pathsub.c
|
||||
ifeq ($(subst /,_,$(shell uname -s)),OS2)
|
||||
DIRS = os2
|
||||
LOCAL_INCLUDES += -I$(srcdir)/os2
|
||||
HSRCS += dirent.h getopt.h
|
||||
HSRCS += $(srcdir)/dirent.h $(srcdir)/getopt.h
|
||||
endif
|
||||
|
||||
PLSRCS = nfspwd.pl revdepth.pl
|
||||
@@ -37,7 +37,14 @@ PLSRCS = nfspwd.pl revdepth.pl
|
||||
TARGETS = $(PROGRAM) $(PLSRCS:.pl=)
|
||||
|
||||
# Generate the build number on the fly.
|
||||
TARGETS += $(DEPTH)/build/build_number
|
||||
ifdef BUILD_OFFICIAL
|
||||
TARGETS += $(DEPTH)/build/build_number
|
||||
endif
|
||||
|
||||
# If this is an "official mozilla build" make them shortlived.
|
||||
ifdef MOZILLA_OFFICIAL
|
||||
TARGETS += $(DEPTH)/modules/libpref/src/init/all.js
|
||||
endif
|
||||
|
||||
ifneq ($(subst /,_,$(shell uname -s)),WINNT)
|
||||
PROGRAM = nsinstall$(BIN_SUFFIX)
|
||||
@@ -91,12 +98,11 @@ $(OBJDIR)/gtscc$(BIN_SUFFIX): $(OBJDIR)/gtscc.o
|
||||
|
||||
#update build number from within make script
|
||||
$(DEPTH)/build/build_number: FORCE
|
||||
@$(MAKE_OBJDIR)
|
||||
$(RM) $@
|
||||
$(PERL) $(srcdir)/bdate.pl > $@
|
||||
$(PERL) $(srcdir)/aboutime.pl $(DEPTH)/l10n/us/xp/about-all.html $@
|
||||
$(PERL) bdate.pl > $@
|
||||
$(PERL) aboutime.pl $(topsrcdir)/l10n/us/xp/about-all.html $@
|
||||
|
||||
$(topsrcdir)/modules/libpref/src/init/all.js: FORCE
|
||||
$(DEPTH)/modules/libpref/src/init/all.js: FORCE
|
||||
$(PERL) set-timebomb.pl
|
||||
|
||||
$(OBJDIR)/bdate$(BIN_SUFFIX): $(OBJDIR)/bdate.o
|
||||
@@ -118,7 +124,6 @@ endif
|
||||
|
||||
clean clobber realclean clobber_all:: tweak_nspr
|
||||
|
||||
|
||||
# For the continuous build scripts.
|
||||
show_objname:
|
||||
@echo $(OBJDIR)
|
||||
|
||||
@@ -56,6 +56,10 @@ endif
|
||||
|
||||
DIRS += libmocha libstyle
|
||||
|
||||
ifdef DOM
|
||||
DIRS += libdom
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
DIRS += libcnv
|
||||
endif
|
||||
|
||||
@@ -27,6 +27,8 @@ LIBRARY_NAME = lay
|
||||
|
||||
EXPORTS = laylayer.h layout.h lo_funcs.h
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
CSRCS = bullet.c \
|
||||
clipline.c \
|
||||
layarena.c \
|
||||
@@ -57,7 +59,11 @@ CSRCS = bullet.c \
|
||||
laytrav.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = parse style js layer applet nspr security dbm img util jtools edtplug java hook pref libfont lay rdf network htmldlgs privacy oji ojiimpl xpcom
|
||||
REQUIRES = parse style js layer applet nspr security dbm img util jtools edtplug java hook pref libfont lay rdf network htmldlgs privacy mocha oji ojiimpl xpcom
|
||||
|
||||
ifdef DOM
|
||||
REQUIRES += dom
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
@@ -85,18 +91,20 @@ CPPSRCS = streams.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef DOM
|
||||
DEFINES += -DDOM=1
|
||||
endif
|
||||
|
||||
ifneq ($(OS_ARCH),OS2)
|
||||
$(OBJDIR)/laymocha.o: laymocha.c
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CC) -o $@ -c $(CFLAGS) -I$(topsrcdir)/mocha/include $<
|
||||
$(CC) -o $@ -c $(CFLAGS) -I$(srcdir)/mocha/include $<
|
||||
else
|
||||
$(OBJDIR)/laymocha.o: laymocha.c
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CC) -Fo$@ -c $(CFLAGS) -I$(topsrcdir)/mocha/include $<
|
||||
$(CC) -Fo$@ -c $(CFLAGS) -I$(srcdir)/mocha/include $<
|
||||
endif
|
||||
|
||||
$(LIBRARY): $(OBJS)
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
@@ -29,7 +29,13 @@ LIBRARY_NAME = mocha
|
||||
|
||||
REQUIRES = lay parse img js style layer applet dbm nspr security \
|
||||
htmldlgs util jtools pref caps java libreg softupdt jsdebug \
|
||||
netcache network httpurl plugin plugimpl oji ojiimpl xpcom
|
||||
netcache network httpurl plugin plugimpl mocha oji ojiimpl xpcom
|
||||
|
||||
ifdef DOM
|
||||
EXPORTS = lm_dom.h # required by layout
|
||||
REQUIRES += dom
|
||||
endif
|
||||
|
||||
|
||||
ifdef MOZ_SECURITY
|
||||
REQUIRES += jar
|
||||
@@ -70,8 +76,19 @@ CSRCS += \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef DOM
|
||||
CSRCS += lm_dom.c \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef DOM
|
||||
DEFINES += -DDOM
|
||||
endif
|
||||
|
||||
DEFINES += -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
|
||||
|
||||
TAINT_CFLAGS = $(CFLAGS) -I$(topsrcdir)/lib/libjar -I$(DEPTH)/sun-java/netscape/security/_jri \
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
@@ -36,6 +36,6 @@ CSRCS = cslabel.c \
|
||||
picsapi.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = js nspr dbm img layer util pref security
|
||||
REQUIRES = js nspr dbm img layer util pref security httpurl network
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
5
mozilla/network/cache/nu/public/Makefile.in
vendored
5
mozilla/network/cache/nu/public/Makefile.in
vendored
@@ -17,12 +17,13 @@
|
||||
|
||||
DEPTH=../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXPORTS = \
|
||||
nsMonitorable.h \
|
||||
nsMemModule.h \
|
||||
nsCacheManager.h \
|
||||
nsDiskModule.h \
|
||||
@@ -32,7 +33,7 @@ EXPORTS = \
|
||||
nsCachePref.h \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
MODULE = cache
|
||||
|
||||
|
||||
15
mozilla/network/cache/nu/src/Makefile.in
vendored
15
mozilla/network/cache/nu/src/Makefile.in
vendored
@@ -17,8 +17,8 @@
|
||||
|
||||
DEPTH=../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
@@ -28,6 +28,8 @@ LIBRARY_NAME=cachelib
|
||||
|
||||
MISCDEP = \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)/lib/dbm32.lib \
|
||||
$(DIST)/lib/libplc21.lib \
|
||||
$(DIST)/lib/xpcom32.lib \
|
||||
$(NULL)
|
||||
|
||||
@@ -41,13 +43,20 @@ CPPSRCS = nsCacheObject.cpp \
|
||||
nsCacheTrace.cpp \
|
||||
nsCachePref.cpp \
|
||||
nsMemCacheObject.cpp \
|
||||
nsBkgThread.cpp \
|
||||
nsCacheBkgThd.cpp \
|
||||
CacheStubs.cpp \
|
||||
nsFileStream.cpp \
|
||||
nsMemStream.cpp \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = dbm nspr pref xpcom
|
||||
|
||||
LLIBS = \
|
||||
$(DIST)/lib/xpcom32.lib \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)/lib/dbm32.lib \
|
||||
$(DIST)/lib/libplc21.lib \
|
||||
$(DIST)/lib/xpcom32.lib \
|
||||
$(LIBNSPR) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@@ -60,7 +60,7 @@ endif
|
||||
|
||||
EXPORTS= mkstream.h mkparse.h mkfsort.h mksort.h mkgeturl.h \
|
||||
netstream.h mkselect.h mktcp.h netutils.h mkpadpac.h mkautocf.h mkhelp.h \
|
||||
mkutils.h mktrace.h
|
||||
mkutils.h mktrace.h net_xp_file.h
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
EXPORTS += mkldap.h
|
||||
|
||||
Reference in New Issue
Block a user