Sync'd various Makefile.ins to their Makefile counterparts.
Removed nspr & nspr20 from REQUIRES. Removed NSPR_LDFLAGS. Changed LIBNSPR refs to NSPR_LIBS. Removed leftover NSPR20 ifdefs.
This commit is contained in:
cls%seawood.org
Родитель
4a135c8640
Коммит
001ed2ffd4
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
DEPTH=../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DEFINES =-D_IMPL_NS_BASE
|
||||
|
||||
ifeq ($(OS_ARCH),Rhapsody)
|
||||
ifeq ($(OS_TARGET),Rhapsody)
|
||||
DIRS = rhapsody
|
||||
else
|
||||
DIRS = unix
|
||||
|
|
@ -40,7 +40,7 @@ CPPSRCS = \
|
|||
nsCRT.cpp \
|
||||
nsDeque.cpp \
|
||||
nsRBTree.cpp \
|
||||
nsSizeOfHandler.cpp \
|
||||
nsSizeOfHandler.cpp \
|
||||
nsString.cpp \
|
||||
nsUnicharBuffer.cpp \
|
||||
nsUnicharInputStream.cpp \
|
||||
|
|
@ -70,7 +70,7 @@ EXPORTS = \
|
|||
nsUnitConversion.h \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
MODULE = raptor
|
||||
|
||||
|
|
@ -81,3 +81,6 @@ include $(topsrcdir)/config/config.mk
|
|||
TARGET = $(LIBARY)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
test:
|
||||
@echo OS_ARCH = $(OS_ARCH)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
#!gmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
|
|
@ -15,43 +14,37 @@
|
|||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
DEPTH=../..
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
REQUIRES=xpcom netlib
|
||||
REQUIRES = xpcom netlib
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
CPPSRCS = TestAtoms.cpp TestCRT.cpp
|
||||
|
||||
CPPSRCS = \
|
||||
TestAtoms.cpp \
|
||||
TestCRT.cpp \
|
||||
$(NULL)
|
||||
OBJS = $(CPPSRCS:.cpp=.o)
|
||||
|
||||
INCLUDES+=-I$(srcdir)/../src
|
||||
EX_LIBS = \
|
||||
$(DIST)/lib/libraptorbase.a \
|
||||
$(DIST)/lib/libxpcom.a \
|
||||
$(NULL)
|
||||
|
||||
OBJS = $(CPPSRCS:.cpp=.o)
|
||||
PROGS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
|
||||
|
||||
EX_LIBS = \
|
||||
$(DIST)/lib/libraptorbase.a \
|
||||
$(DIST)/lib/libxpcom.a \
|
||||
$(DIST)/lib/libplc21.a \
|
||||
$(DIST)/lib/libplds21.a \
|
||||
$(DIST)/lib/libnspr21.a \
|
||||
$(NULL)
|
||||
|
||||
PROGS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
|
||||
|
||||
TARGETS = $(PROGS)
|
||||
TARGETS = $(PROGS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(srcdir)/../src
|
||||
|
||||
# needed for mac linux
|
||||
ifeq (linux,$(ARCH))
|
||||
OS_LIBS += /usr/lib/libdl.so
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
ifneq ($(OS_RELEASE),1.2)
|
||||
OS_LIBS += /usr/lib/libdl.so
|
||||
endif
|
||||
endif
|
||||
|
||||
$(OBJDIR)/%.o: %.cpp
|
||||
|
|
@ -60,7 +53,7 @@ $(OBJDIR)/%.o: %.cpp
|
|||
|
||||
$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
|
||||
$(CCC) -o $@ $(LDFLAGS) $^ $(NSPR_LIBS) $(OS_LIBS)
|
||||
|
||||
install:: $(TARGETS)
|
||||
$(INSTALL) $(PROGS) $(DIST)/bin
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ CPPSRCS = \
|
|||
nsCCodeSourcePrincipal.cpp \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = nspr xpcom security layer js jar zlib pref img util rdf caps
|
||||
REQUIRES = xpcom security layer js jar zlib pref img util rdf caps
|
||||
|
||||
ifndef MOZ_NATIVE_ZLIB
|
||||
REQUIRES += zlib
|
||||
|
|
|
|||
|
|
@ -403,13 +403,13 @@ endif
|
|||
|
||||
BASIC_LIBS += $(DIST)/lib/libhtmldlgs.a $(DIST)/lib/libsecfree.a
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2)
|
||||
|
||||
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
FRANCE_DEPLIBS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2)
|
||||
|
||||
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
US_DEPLIBS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2)
|
||||
|
||||
DSO_EX_LIBS = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
|
||||
|
|
@ -582,9 +582,9 @@ ifeq ($(OS_ARCH),OSF1)
|
|||
|
||||
OTHER_LIBS = -ldnet_stubs -lm -lots $(OS_LIBS)
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
|
||||
ifdef MOZ_EDITOR
|
||||
#
|
||||
|
|
@ -705,13 +705,13 @@ endif
|
|||
|
||||
US_LDFLAGS = -z defs -L$(USRLIBDIR) \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) \
|
||||
$(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
$(NSPR_LIBS) $(OTHER_LIBS)
|
||||
EXPORT_LDFLAGS = -z defs -L$(USRLIBDIR) \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) \
|
||||
$(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
$(NSPR_LIBS) $(OTHER_LIBS)
|
||||
FRANCE_LDFLAGS = -z defs -L$(USRLIBDIR) \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) \
|
||||
$(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
$(NSPR_LIBS) $(OTHER_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ MODULE = gnuzilla
|
|||
|
||||
LIBRARY_NAME = gnuzilla
|
||||
|
||||
REQUIRES = nspr layer js jtools applet security img util parse layout hook pref java libfont ldap lay style xfeicons rdf xpcom plug mariner gnuzilla-widgets
|
||||
REQUIRES = layer js jtools applet security img util parse layout hook pref java libfont ldap lay style xfeicons rdf xpcom plug mariner gnuzilla-widgets
|
||||
|
||||
CSRCS = g-bookmark-frame.c \
|
||||
g-bookmark-view.c \
|
||||
|
|
|
|||
|
|
@ -76,7 +76,6 @@ REQUIRES = \
|
|||
libfont \
|
||||
mariner \
|
||||
plds \
|
||||
nspr20 \
|
||||
parse \
|
||||
plugin \
|
||||
plugimpl \
|
||||
|
|
@ -507,7 +506,7 @@ endif
|
|||
|
||||
LOCALES = $(LOCALE_MAP) $(MAIL_IM_HACK) $(NEWS_IM_HACK)
|
||||
|
||||
ALL_EXPORT_LIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS)
|
||||
ALL_EXPORT_LIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
|
||||
|
||||
ALL_EXPORT_DSOS = $(ALL_EXPORT_LIBS:$(DIST)/lib/lib%.a=-l%)
|
||||
PLUGIN_DSO = $(DIST)/bin/libnullplugin.so
|
||||
|
|
@ -600,7 +599,7 @@ MCS_CMD = true
|
|||
# Only IRIX 5.x uses this.
|
||||
EXTRA_POST_LINK_CMD = echo
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2)
|
||||
|
||||
DSO_EX_LIBS = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
|
||||
|
|
@ -744,7 +743,7 @@ ifeq ($(OS_ARCH),OSF1)
|
|||
#
|
||||
OTHER_LIBS = $(QTLIB) -lX11 -lXext -ldnet_stub -lm -lots $(OS_LIBS)
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -833,7 +832,7 @@ endif
|
|||
|
||||
EXPORT_LDFLAGS = -z defs -L$(MOTIF)/lib -L$(USRLIBDIR) -R$(MOTIF)/lib \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) \
|
||||
$(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
$(NSPR_LIBS) $(OTHER_LIBS)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
|
@ -998,7 +997,7 @@ quantify: $(OBJDIR)/$(QTFE_PROGNAME)-export $(OBJDIR)/$(QTFE_PROGNAME)-export.qu
|
|||
unreferenced: $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(DIST)/bin/gtscc
|
||||
@$(MAKE_OBJDIR)
|
||||
rm -f $@
|
||||
$(DIST)/bin/gtscc -gtsrootdir $(DEPTH) -gtsdump -gtsnorecompile -gtsnolink $(DEPTH) $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) | awk -n '/ 0 0 / { print $$5 " " $$1 }' | sort > $@
|
||||
$(DIST)/bin/gtscc -gtsrootdir $(DEPTH) -gtsdump -gtsnorecompile -gtsnolink $(DEPTH) $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) | awk -n '/ 0 0 / { print $$5 " " $$1 }' | sort > $@
|
||||
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
AIX_HACK := $(notdir $(AIX_NSPR))
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ REQUIRES = \
|
|||
msg \
|
||||
java \
|
||||
plds \
|
||||
nsprpub \
|
||||
parse \
|
||||
plug \
|
||||
plugimpl \
|
||||
|
|
|
|||
|
|
@ -80,13 +80,13 @@ DIRS = \
|
|||
Microline3.0/XmL \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES =\
|
||||
XfeWidgets \
|
||||
XfeBm \
|
||||
XfeToolBar \
|
||||
XfeToolTip \
|
||||
XfeComboBox \
|
||||
Microline \
|
||||
REQUIRES = \
|
||||
XfeWidgets \
|
||||
XfeBm \
|
||||
XfeToolBar \
|
||||
XfeToolTip \
|
||||
XfeComboBox \
|
||||
Microline \
|
||||
addr \
|
||||
applet \
|
||||
xpcom \
|
||||
|
|
@ -99,8 +99,6 @@ REQUIRES =\
|
|||
js \
|
||||
libfont \
|
||||
mariner \
|
||||
plds \
|
||||
nspr20 \
|
||||
parse \
|
||||
plugin \
|
||||
plugimpl \
|
||||
|
|
@ -117,36 +115,29 @@ REQUIRES =\
|
|||
$(NULL)
|
||||
|
||||
ifdef MOZ_LDAP
|
||||
REQUIRES += \
|
||||
ldap \
|
||||
$(NULL)
|
||||
REQUIRES += ldap
|
||||
endif
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
REQUIRES += \
|
||||
msg \
|
||||
$(NULL)
|
||||
REQUIRES += msg
|
||||
else
|
||||
ifdef MOZ_MAIL_COMPOSE
|
||||
REQUIRES += \
|
||||
mailto \
|
||||
$(NULL)
|
||||
REQUIRES += mailto
|
||||
endif
|
||||
endif
|
||||
|
||||
REQUIRES += \
|
||||
REQUIRES += \
|
||||
xfeicons \
|
||||
progress \
|
||||
privacy \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_FULLCIRCLE
|
||||
REQUIRES += fullsoft
|
||||
REQUIRES += fullsoft
|
||||
endif
|
||||
|
||||
ifdef OJI
|
||||
REQUIRES += oji \
|
||||
ojiimpl
|
||||
REQUIRES += oji ojiimpl
|
||||
endif
|
||||
|
||||
CSRCS = \
|
||||
|
|
@ -219,7 +210,7 @@ GUESS_CONFIG := $(shell $(topsrcdir)/config/config.guess | sed 's/i[23456]86/x86
|
|||
CCLD = $(CCC)
|
||||
LDFLAGS = $(CFLAGS)
|
||||
NOMD_LDFLAGS = $(NOMD_CFLAGS)
|
||||
BASIC_DSOS = -L$(DIST)/bin
|
||||
BASIC_DSOS = -L$(DIST)/bin
|
||||
|
||||
ifdef MOZILLA_GPROF
|
||||
CSRCS += gmon.c
|
||||
|
|
@ -260,9 +251,11 @@ XFE_WIDGETS_TOOL_TIP_LIB = $(DIST)/lib/libXfeToolTip.a
|
|||
|
||||
ifneq ($(OS_ARCH),IRIX)
|
||||
ifneq ($(OS_ARCH),FreeBSD)
|
||||
ifneq ($(OS_ARCH),Rhapsody)
|
||||
DYNAMIC_SYMBOLS_F = -rdynamic # default
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_ARCH),SunOS)
|
||||
ifdef NS_USE_NATIVE
|
||||
DYNAMIC_SYMBOLS_F = -Bdynamic
|
||||
|
|
@ -278,8 +271,7 @@ ifeq ($(OS_ARCH),AIX)
|
|||
NSPR_LIBS =
|
||||
else
|
||||
ifndef FULL_STATIC_BUILD
|
||||
NSPR_LIBS =
|
||||
BASIC_DSOS += $(NSPR_DIR)/lib/libplds21.so $(NSPR_DIR)/lib/libplc21.so $(NSPR_DIR)/lib/libnspr21.so
|
||||
BASIC_DSOS += $(NSPR_LIBS)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -310,10 +302,10 @@ BASIC_LIBS = \
|
|||
$(XFE_WIDGETS_LIB) \
|
||||
$(DIST)/lib/libxlate.a \
|
||||
$(DIST)/lib/libmimetype.a \
|
||||
$(DIST)/lib/libnetwork.a \
|
||||
$(DIST)/lib/libnetcache.a \
|
||||
$(DIST)/lib/libnetcnvts.a \
|
||||
$(DIST)/lib/libnetwork.a \
|
||||
$(DIST)/lib/libnetutil.a \
|
||||
$(DIST)/lib/libnetutil.a \
|
||||
$(DIST)/lib/libnetcnvts.a \
|
||||
$(DIST)/lib/libcnetinit.a \
|
||||
$(DIST)/lib/libabouturl.a \
|
||||
|
|
@ -326,11 +318,11 @@ BASIC_LIBS = \
|
|||
$(DIST)/lib/libmarimurl.a \
|
||||
$(DIST)/lib/libremoturl.a \
|
||||
$(DIST)/lib/lib$(LITE_PREFIX)rdf.a \
|
||||
$(DIST)/lib/libnetwork.a \
|
||||
$(DIST)/lib/lib$(LITE_PREFIX)xml.a \
|
||||
$(DIST)/lib/lib$(LITE_PREFIX)lay.a \
|
||||
$(DIST)/lib/libmariner.a \
|
||||
$(DIST)/lib/libimg.a \
|
||||
$(DIST)/lib/libnetwork.a \
|
||||
$(DIST)/lib/libprivacy.a \
|
||||
$(NULL)
|
||||
|
||||
|
|
@ -339,7 +331,7 @@ BASIC_LIBS += $(DIST)/lib/libli.a
|
|||
endif
|
||||
|
||||
ifdef JAVA_OR_NSJVM
|
||||
JAVA_JMC = $(DIST)/lib/libjmc.a # XXX To be removed...
|
||||
JAVA_JMC = $(DIST)/lib/libjmc.a # XXX To be removed...
|
||||
endif
|
||||
|
||||
BASIC_LIBS += \
|
||||
|
|
@ -366,28 +358,41 @@ BASIC_LIBS_2 = \
|
|||
# so just link against libnetutil twice.
|
||||
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libmime.a \
|
||||
$(DIST)/lib/libnetutil.a \
|
||||
$(DIST)/lib/libmime.a \
|
||||
$(DIST)/lib/libnetutil.a \
|
||||
$(NULL)
|
||||
|
||||
ifdef SMART_MAIL
|
||||
BASIC_LIBS += $(DIST)/lib/libpop3url.a
|
||||
endif
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
ifdef MOZ_SECURITY
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libns_mime.a \
|
||||
$(NULL)
|
||||
BASIC_LIBS += $(DIST)/lib/libns_mime.a
|
||||
endif
|
||||
BASIC_LIBS_2 += \
|
||||
$(DIST)/lib/libldap.a \
|
||||
$(NULL)
|
||||
BASIC_LIBS_2 += $(DIST)/lib/libldap.a
|
||||
endif
|
||||
|
||||
ifdef SMART_MAIL
|
||||
ifdef MOZ_SECURITY
|
||||
BASIC_LIBS += $(DIST)/lib/libns_mime.a
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libns_mime.a \
|
||||
$(NULL)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Do we need libns_mime.a here if MOZ_MAIL_COMPOSE and MOZ_SECURITY?
|
||||
#ifdef MOZ_MAIL_COMPOSE
|
||||
#ifdef MOZ_SECURITY
|
||||
#BASIC_LIBS += $(DIST)/lib/libns_mime.a
|
||||
#endif
|
||||
#endif
|
||||
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libmisc.a \
|
||||
$(DIST)/lib/libprgrss.a \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_LDAP
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libldap.a \
|
||||
|
|
@ -395,12 +400,6 @@ BASIC_LIBS += \
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef SMART_MAIL
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libpop3url.a \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libmozmsg.a \
|
||||
|
|
@ -449,8 +448,6 @@ BASIC_LIBS += \
|
|||
endif
|
||||
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libmisc.a \
|
||||
$(DIST)/lib/libprgrss.a \
|
||||
$(DIST)/lib/lib$(LITE_PREFIX)plug.a \
|
||||
$(DIST)/lib/libutil.a \
|
||||
$(DIST)/lib/libfont.a \
|
||||
|
|
@ -493,9 +490,7 @@ BASIC_LIBS += \
|
|||
$(NULL)
|
||||
|
||||
ifdef MOZ_SMARTUPDATE
|
||||
BASIC_LIBS += $(DIST)/lib/libsoftupdate.a \
|
||||
$(DIST)/lib/libprgrss.a \
|
||||
$(NULL)
|
||||
BASIC_LIBS += $(DIST)/lib/libsoftupdate.a $(DIST)/lib/libprgrss.a
|
||||
endif
|
||||
|
||||
ifdef MOZ_SECURITY
|
||||
|
|
@ -513,10 +508,9 @@ else # !MOZ_JAVA
|
|||
#
|
||||
# OJI
|
||||
#
|
||||
|
||||
ifdef MOZ_OJI
|
||||
|
||||
BASIC_LIBS += $(DIST)/lib/liboji.a
|
||||
BASIC_LIBS += $(DIST)/lib/liboji.a
|
||||
|
||||
ifdef NSJVM
|
||||
|
||||
|
|
@ -530,8 +524,7 @@ BASIC_LIBS += \
|
|||
$(NULL)
|
||||
endif # !NSJVM
|
||||
|
||||
BASIC_LIBS += $(DIST)/lib/libprgrss.a \
|
||||
$(NULL)
|
||||
BASIC_LIBS += $(DIST)/lib/libprgrss.a
|
||||
|
||||
else # !MOZ_OJI
|
||||
# No Monolithic Java, no OJI, just stubs.
|
||||
|
|
@ -565,12 +558,12 @@ BASIC_DSOS += \
|
|||
ifndef NO_MOCHA
|
||||
# XXX To a DSO...
|
||||
ifdef FULL_STATIC_BUILD
|
||||
BASIC_LIBS += $(DIST)/lib/libjs.a
|
||||
BASIC_LIBS += $(DIST)/lib/libjs.a
|
||||
ifdef JAVA_OR_OJI
|
||||
BASIC_LIBS += $(DIST)/lib/libjsj.a
|
||||
endif
|
||||
else
|
||||
BASIC_DSOS += -ljs
|
||||
BASIC_DSOS += -ljs
|
||||
ifdef JAVA_OR_OJI
|
||||
BASIC_DSOS += -ljsj
|
||||
endif
|
||||
|
|
@ -578,7 +571,7 @@ endif
|
|||
BASIC_LIBS += $(DIST)/lib/libmocha.a
|
||||
ifdef DOM
|
||||
# the DOM code calls back into layout.
|
||||
BASIC_LIBS += $(DIST)/lib/liblay.a
|
||||
BASIC_LIBS += $(DIST)/lib/liblay.a
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -590,7 +583,7 @@ endif
|
|||
BASIC_LIBS += $(DIST)/lib/libstyle.a
|
||||
|
||||
ifdef MOZ_SECURITY
|
||||
BASIC_LIBS += $(DIST)/lib/libjar.a
|
||||
BASIC_LIBS += $(DIST)/lib/libjar.a
|
||||
else
|
||||
EXPORT_LIB = $(DIST)/lib/libhtmldlgs.a $(DIST)/lib/libsecfree.a
|
||||
endif
|
||||
|
|
@ -719,7 +712,6 @@ EXPORT_LDFLAGS =\
|
|||
$(EXPORT_LIB) \
|
||||
$(BASIC_LIBS_2) \
|
||||
$(BASIC_DSOS) \
|
||||
$(NSPR_LDFLAGS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(OTHER_LIBS)
|
||||
|
||||
|
|
@ -728,7 +720,6 @@ EXPORT_DYN_MOTIF_LDFLAGS =\
|
|||
$(EXPORT_LIB) \
|
||||
$(BASIC_LIBS_2) \
|
||||
$(BASIC_DSOS) \
|
||||
$(NSPR_LDFLAGS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(OTHER_DYN_MOTIF_LIBS)
|
||||
|
||||
|
|
@ -761,7 +752,7 @@ FRANCE_LDFLAGS += $(AIX_NSPR_LINK)
|
|||
EXTRA_REL_FILES += $(AIX_NSPR)
|
||||
|
||||
ifndef NO_WEBFONTS
|
||||
EXTRA_REL_FILES += $(WEBFONT_DSO)
|
||||
EXTRA_REL_FILES += $(WEBFONT_DSO)
|
||||
endif
|
||||
|
||||
endif
|
||||
|
|
@ -775,31 +766,25 @@ endif
|
|||
########################################
|
||||
# NetBSD
|
||||
ifeq ($(OS_ARCH),NetBSD)
|
||||
OTHER_LIBS = /usr/X11R6/lib/libXm.a -L/usr/X11R6/lib -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
|
||||
endif
|
||||
|
||||
########################################
|
||||
# NetBSD
|
||||
# Work around linker semantics that will never find our own libutil on 1.3.x
|
||||
ifeq ($(OS_ARCH),NetBSD)
|
||||
ifeq ($(OS_MINOR),3)
|
||||
ifeq ($(shell uname -r | cut -f2 -d.),3)
|
||||
FOOL_GMAKE = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
|
||||
DSO_EX_LIBS = $(FOOL_GMAKE:-lutil=$(DIST)/lib/libutil.a)
|
||||
endif
|
||||
|
||||
ifdef LIBRUNPATH
|
||||
OS_LIBS += -R$(LIBRUNPATH)
|
||||
endif
|
||||
|
||||
OTHER_LIBS = -L/usr/X11R6/lib -lXm -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
########################################
|
||||
# OpenBSD
|
||||
# Copied from NetBSD...
|
||||
ifeq ($(OS_ARCH),OpenBSD)
|
||||
#ifeq ($(OS_MINOR),3)
|
||||
#FOOL_GMAKE = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
|
||||
#DSO_EX_LIBS = $(FOOL_GMAKE:-lutil=$(DIST)/lib/libutil.a)
|
||||
#endif
|
||||
ifdef LIBRUNPATH
|
||||
OS_LIBS += -R$(LIBRUNPATH)
|
||||
endif
|
||||
|
|
@ -817,6 +802,10 @@ X11R6LIBS = $(LOC_LIB_DIR)/libSM.a $(LOC_LIB_DIR)/libICE.a
|
|||
OTHER_LIBS += -lipc
|
||||
endif
|
||||
|
||||
ifeq ($(OS_RELEASE),4.0)
|
||||
X11R6LIBS = $(LOC_LIB_DIR)/libSM.a $(LOC_LIB_DIR)/libICE.a
|
||||
endif
|
||||
|
||||
NEED_NLS = 1
|
||||
|
||||
endif
|
||||
|
|
@ -826,14 +815,14 @@ endif
|
|||
ifeq ($(OS_ARCH),HP-UX)
|
||||
|
||||
ifeq ($(OS_RELEASE),A.09)
|
||||
HPUX_XLIBS = -L/usr/lib/X11R5 -L/usr/contrib/X11R5/lib -L/usr/lib/Motif1.2
|
||||
HPUX_XLIBS = -L/usr/lib/X11R5 -L/usr/contrib/X11R5/lib -L/usr/lib/Motif1.2
|
||||
endif
|
||||
ifeq ($(OS_RELEASE),B.10)
|
||||
INCLUDES += -I.
|
||||
HPUX_XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -L/usr/lib/Motif1.2_R6 -L/usr/lib/Motif1.2
|
||||
INCLUDES += -I.
|
||||
HPUX_XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -L/usr/lib/Motif1.2_R6 -L/usr/lib/Motif1.2
|
||||
endif
|
||||
ifeq ($(OS_RELEASE),B.11)
|
||||
HPUX_XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -L/usr/lib/Motif2.1
|
||||
HPUX_XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -L/usr/lib/Motif2.1
|
||||
endif
|
||||
|
||||
HPUX_RESOURCE_HACK = -Wp,-H16384
|
||||
|
|
@ -843,7 +832,7 @@ OTHER_LIBS = $(HPUX_XLIBS) -lXm -L$(DIST)/lib -lXmu -lXt -lX11 -lXext $(OS_LIBS)
|
|||
ifdef MOZ_EDITOR
|
||||
|
||||
ifdef NS_USE_GCC
|
||||
CCLD = $(CCC)
|
||||
CCLD = $(CCC)
|
||||
else
|
||||
EXPORT_DEPLIBS += cxxlink-filter
|
||||
US_DEPLIBS += cxxlink-filter
|
||||
|
|
@ -896,7 +885,7 @@ endif
|
|||
endif
|
||||
|
||||
ifndef NO_WEBFONTS
|
||||
EXTRA_REL_FILES += $(WEBFONT_DSO)
|
||||
EXTRA_REL_FILES += $(WEBFONT_DSO)
|
||||
endif
|
||||
|
||||
endif
|
||||
|
|
@ -912,44 +901,38 @@ else
|
|||
OS_LIBS = -lm -ldl
|
||||
endif
|
||||
|
||||
XFE_MOTIF_LDFLAGS =\
|
||||
$(MOZILLA_XFE_GLIBC_BROKEN_LOCALE_FLAGS) \
|
||||
$(MOZILLA_XFE_MOTIF_FLAGS) \
|
||||
$(MOZILLA_XFE_MOTIF_PRINT_SHELL_FLAGS)
|
||||
XFE_MOTIF_LDFLAGS = \
|
||||
$(MOZILLA_XFE_GLIBC_BROKEN_LOCALE_FLAGS) \
|
||||
$(MOZILLA_XFE_MOTIF_FLAGS) \
|
||||
$(MOZILLA_XFE_MOTIF_PRINT_SHELL_FLAGS)
|
||||
|
||||
XFE_X11_LDFLAGS =\
|
||||
$(MOZILLA_XFE_X11_DYNAMIC_PATHS) \
|
||||
-lXt \
|
||||
-lXmu \
|
||||
$(MOZILLA_XFE_MOTIF_XPM_FLAGS) \
|
||||
$(MOZILLA_XFE_X11_DYNAMIC_FLAGS) \
|
||||
-lXext \
|
||||
$(MOZILLA_XFE_X11_SM_FLAGS)
|
||||
XFE_X11_LDFLAGS = \
|
||||
$(MOZILLA_XFE_X11_DYNAMIC_PATHS) \
|
||||
-lXt \
|
||||
-lXmu \
|
||||
$(MOZILLA_XFE_MOTIF_XPM_FLAGS) \
|
||||
$(MOZILLA_XFE_X11_DYNAMIC_FLAGS) \
|
||||
-lXext \
|
||||
$(MOZILLA_XFE_X11_SM_FLAGS)
|
||||
|
||||
OTHER_LIBS =\
|
||||
$(XFE_MOTIF_LDFLAGS) \
|
||||
$(XFE_X11_LDFLAGS) \
|
||||
$(OS_LIBS)
|
||||
OTHER_LIBS = $(XFE_MOTIF_LDFLAGS) $(XFE_X11_LDFLAGS) $(OS_LIBS)
|
||||
|
||||
# Dynamic motif binary
|
||||
ifdef MOZILLA_XFE_MOTIF_HAVE_DYNAMIC_LIB
|
||||
|
||||
XFE_DYN_MOTIF_LDFLAGS =\
|
||||
$(MOTIFPATCH_LIB) \
|
||||
$(MOZILLA_XFE_GLIBC_BROKEN_LOCALE_FLAGS) \
|
||||
$(MOZILLA_XFE_MOTIF_DYNAMIC_PATHS) \
|
||||
$(MOZILLA_XFE_MOTIF_DYNAMIC_FLAGS) \
|
||||
$(MOZILLA_XFE_MOTIF_PRINT_SHELL_FLAGS)
|
||||
XFE_DYN_MOTIF_LDFLAGS = \
|
||||
$(MOTIFPATCH_LIB) \
|
||||
$(MOZILLA_XFE_GLIBC_BROKEN_LOCALE_FLAGS) \
|
||||
$(MOZILLA_XFE_MOTIF_DYNAMIC_PATHS) \
|
||||
$(MOZILLA_XFE_MOTIF_DYNAMIC_FLAGS) \
|
||||
$(MOZILLA_XFE_MOTIF_PRINT_SHELL_FLAGS)
|
||||
|
||||
EXTRA_EXPORT_OBJS = $(OBJDIR)/$(XFE_PROGNAME)-motif-export
|
||||
EXTRA_EXPORT_BINARY = $(EXTRA_EXPORT_OBJS)
|
||||
TARGETS += $(EXTRA_EXPORT_OBJS)
|
||||
|
||||
PLUGIN_DSO += $(DIST)/bin/libnullplugin-dynMotif.so
|
||||
PLUGIN_DSO += $(DIST)/bin/libnullplugin-dynMotif.so
|
||||
|
||||
OTHER_DYN_MOTIF_LIBS =\
|
||||
$(XFE_DYN_MOTIF_LDFLAGS) \
|
||||
$(XFE_X11_LDFLAGS) \
|
||||
$(OS_LIBS)
|
||||
OTHER_DYN_MOTIF_LIBS = $(XFE_DYN_MOTIF_LDFLAGS) $(XFE_X11_LDFLAGS) $(OS_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -957,7 +940,7 @@ endif
|
|||
ifeq ($(OS_RELEASE)$(CPU_ARCH),2.0x86)
|
||||
|
||||
ifndef NO_WEBFONTS
|
||||
EXTRA_REL_FILES += $(WEBFONT_DSO)
|
||||
EXTRA_REL_FILES += $(WEBFONT_DSO)
|
||||
endif
|
||||
|
||||
endif
|
||||
|
|
@ -993,6 +976,12 @@ OTHER_LIBS = -lXm -lXmu -lXt -lX11 -lXext -ldnet_stub -lm -lots $(OS_LIBS)
|
|||
|
||||
endif
|
||||
|
||||
########################################
|
||||
# Apple Rhapsody
|
||||
ifeq ($(OS_ARCH),Rhapsody)
|
||||
OTHER_LIBS = -L/usr/X11R6/lib -lXm -lXmu -lXt -lXext -lX11 -lSM -lICE $(OS_LIBS)
|
||||
endif
|
||||
|
||||
########################################
|
||||
# SNI ReliantUNIX (SINIX)
|
||||
ifeq ($(OS_ARCH),SINIX)
|
||||
|
|
@ -1022,7 +1011,7 @@ OTHER_LIBS = -L$(MOTIF)/lib $(MOTIF)/lib/libXm.a $(MOTIF)/lib/libXmu.a $(MOTIF)/
|
|||
$(MOTIF)/lib/libXext.a $(MOTIF)/lib/libX11.a
|
||||
|
||||
ifndef NO_WEBFONTS
|
||||
EXTRA_REL_FILES += $(WEBFONT_DSO)
|
||||
EXTRA_REL_FILES += $(WEBFONT_DSO)
|
||||
endif
|
||||
|
||||
ifdef MOZ_EDITOR
|
||||
|
|
@ -1069,7 +1058,7 @@ MCS_CMD = mcs -d
|
|||
ifeq ($(CPU_ARCH),sparc)
|
||||
OTHER_LIBS = $(MOTIFPATCH_LIB) $(MOTIFLIB) -lXt -lXmu -lXext -lX11 $(OS_LIBS) -lgen -lresolv -lm
|
||||
ifndef NO_WEBFONTS
|
||||
EXTRA_REL_FILES += $(WEBFONT_DSO)
|
||||
EXTRA_REL_FILES += $(WEBFONT_DSO)
|
||||
endif
|
||||
else
|
||||
OTHER_LIBS = $(MOTIFLIB) -lXt -lXmu -lXext -lX11 $(OS_LIBS) -lm
|
||||
|
|
@ -1078,7 +1067,7 @@ endif
|
|||
|
||||
EXPORT_LDFLAGS = -z defs -L$(MOTIF)/lib -L$(USRLIBDIR) -R$(MOTIF)/lib \
|
||||
-R$(USRLIBDIR) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) \
|
||||
$(BASIC_DSOS) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
$(BASIC_DSOS) $(NSPR_LIBS) $(OTHER_LIBS)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
|
@ -1099,17 +1088,15 @@ endif
|
|||
|
||||
########################################
|
||||
# Data General DG/UX
|
||||
ifeq ($(OS_ARCH),dgux)
|
||||
ifeq ($(OS_ARCH),DGUX)
|
||||
|
||||
OTHER_LIBS = $(MOTIFLIB) $(OS_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
ifdef USE_AUTOCONF
|
||||
# Override all of the above with the autoconf variables
|
||||
OTHER_LIBS = $(FE_X_LIBS) $(ACLFLAGS) $(ACLIBS)
|
||||
OTHER_DYN_MOTIF_LIBS = $(FE_X_LIBS) $(ACLFLAGS) $(ACLIBS)
|
||||
endif
|
||||
|
||||
|
||||
#######################################################################
|
||||
|
||||
|
|
@ -1200,7 +1187,7 @@ $(OBJDIR)/e_kit.o: e_kit.c e_kit_resources.h
|
|||
e_kit_resources.h: e_kit.ad
|
||||
@echo 'char* fe_ekitDefaultDatabase = ' > $@
|
||||
cat $< | tr '[\001-\272]' '[\106-\377]' | \
|
||||
od -b | sed 's/^[0-7][0-7]* *\(.*\)/\\\1/; \
|
||||
od -b | sed 's/^[0-7][0-7]* *\(.*\)/\\\1/; \
|
||||
s/ /\\/g;s/\(.*\)/ "\1"/;s/^ *"\\"$$//' >> $@
|
||||
@echo ';' >> $@
|
||||
|
||||
|
|
@ -1218,12 +1205,14 @@ ifdef NETSCAPE_OFFICIAL
|
|||
@echo Creating a list of all object files ... objs.txt
|
||||
@echo $(OBJS) > $(OBJDIR)/objs.txt
|
||||
@echo $(EXPORT_OBJS) >> $(OBJDIR)/objs.txt
|
||||
@echo -L$(DIST)/bin >> $(OBJDIR)/objs.txt
|
||||
@echo -L$(DIST)/lib >> $(OBJDIR)/objs.txt
|
||||
@echo $(DSO_EX_LIBS) >> $(OBJDIR)/objs.txt
|
||||
@echo Creating a list of all symbols ... symbols.txt
|
||||
$(PERL) listsymb.pl objs.txt symbols.txt
|
||||
$(PERL) listsymb.pl $(OBJDIR)/objs.txt $(OBJDIR)/symbols.txt
|
||||
@echo Generating dispatch table ... dispunix.h dispunix.c cmoffset.h
|
||||
$(PERL) gendisp.pl symbols.txt dispunix.h dispunix.c cmoffset.h
|
||||
$(CC) -c -o $(OBJDIR)/dispunix.o -I$(DIST)/include dispunix.c
|
||||
$(PERL) gendisp.pl $(OBJDIR)/symbols.txt $(OBJDIR)/dispunix.h $(OBJDIR)/dispunix.c
|
||||
$(CC) -c -o $(OBJDIR)/dispunix.o -I$(DIST)/include -I$(OBJDIR) $(OBJDIR)/dispunix.c
|
||||
$(CCLD) -o $@ $(LDFLAGS) $(OBJDIR)/dispunix.o $(OBJS) $(EXPORT_OBJS) -L$(DIST)/bin -L$(DIST)/lib $(DSO_EX_LIBS) $(DNS_LIB)
|
||||
else
|
||||
$(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(EXPORT_OBJS) -L$(DIST)/bin -L$(DIST)/lib $(DSO_EX_LIBS) $(DNS_LIB)
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
##########################################################################
|
||||
|
||||
|
||||
DEPTH = ../../../..
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -46,6 +46,8 @@ CSRCS = \
|
|||
|
||||
REQUIRES = \
|
||||
XfeCaption \
|
||||
XfeToolBar \
|
||||
XfeComboBox \
|
||||
XfeWidgets
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,8 @@ REQUIRES = \
|
|||
XfeTest \
|
||||
XfeWidgets \
|
||||
XfeBm \
|
||||
XfeToolBar
|
||||
XfeToolBar \
|
||||
XfeComboBox
|
||||
|
||||
EXPORTS = \
|
||||
XfeTest.h \
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ LIBRARY_NAME = xfeicons
|
|||
CSRCS = $(ICONS_GEN_SRC)
|
||||
EXPORTS = $(ICONS_GEN_HDR) $(srcdir)/icondata.h
|
||||
|
||||
REQUIRES = img java jtools layer nspr util xp xpcom
|
||||
REQUIRES = img java jtools layer util xp xpcom
|
||||
|
||||
REQUIRES += \
|
||||
$(XFE_JPEG_REQUIRES) \
|
||||
|
|
@ -106,13 +106,20 @@ MAIL_OR_COMPOSE_ICONS = $(wildcard $(srcdir)/images/MNC*.gif \
|
|||
$(srcdir)/images/MNTB_Next*.gif \
|
||||
$(srcdir)/images/MNTB_Forward*.gif \
|
||||
$(srcdir)/images/MNAB_NewPerson*.gif \
|
||||
$(srcdir)/images/MN_*)
|
||||
$(srcdir)/images/MN_Draft*.gif \
|
||||
$(srcdir)/images/MN_Collect*.gif \
|
||||
$(srcdir)/images/MN_Template*.gif ) \
|
||||
$(addprefix $(srcdir)/, \
|
||||
images/MN_MailAttach.gif \
|
||||
images/MN_Person.gif \
|
||||
images/MN_People.gif )
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
ICONS += $(MAIL_OR_COMPOSE_ICONS) \
|
||||
$(wildcard $(srcdir)/images/MNTB*.gif $(srcdir)/images/MNAB*.gif) \
|
||||
$(addprefix $(srcdir)/, images/threadoff.gif \
|
||||
images/threadon.gif
|
||||
$(addprefix $(srcdir)/,
|
||||
images/threadoff.gif \
|
||||
images/threadon.gif \
|
||||
images/Desk_Address.gif \
|
||||
images/Desk_Collabra.gif \
|
||||
images/Desk_Messenger.gif \
|
||||
|
|
@ -169,7 +176,7 @@ MKICONS_DSOS = \
|
|||
$(XFE_MKICONS_ZLIB_DSO) \
|
||||
$(NULL)
|
||||
|
||||
MKICONS_EXTRA = $(NSPR_LDFLAGS) $(NSPR_LIBS) $(MKICONS_DSOS) $(OS_LIBS) -lm
|
||||
MKICONS_EXTRA = $(NSPR_LIBS) $(MKICONS_DSOS) $(OS_LIBS) -lm
|
||||
|
||||
#######################################################################
|
||||
# Rules to build mkicons program and then icondata.c
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ REQUIRES =\
|
|||
XfeToolBar \
|
||||
XfeToolTip \
|
||||
Microline \
|
||||
nspr \
|
||||
layer \
|
||||
js \
|
||||
jtools \
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ LIBRARY_NAME = dbm
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG) -DNSPR20=1
|
||||
DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG)
|
||||
|
||||
INCLUDES += -I$(srcdir)/../include
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = jpeg
|
||||
LIBRARY_NAME = jpeg
|
||||
|
||||
REQUIRES = java nspr
|
||||
REQUIRES = java
|
||||
|
||||
EXPORTS = jconfig.h jerror.h jinclude.h jmorecfg.h jpeglib.h jpegint.h jwinfig.h jos2fig.h
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ ifdef JAVA_OR_OJI
|
|||
DIRS = classes
|
||||
endif
|
||||
|
||||
REQUIRES = java js nspr
|
||||
REQUIRES = java js
|
||||
|
||||
EXPORTS = $(srcdir)/jsdebug.h
|
||||
|
||||
|
|
|
|||
|
|
@ -16,11 +16,13 @@
|
|||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifdef MOZ_OJI
|
||||
DIRS = liveconnect
|
||||
endif
|
||||
|
|
@ -32,47 +34,47 @@ ifndef XCFLAGS
|
|||
OS2_IMPLIB=1
|
||||
LIBRARY = js$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
|
||||
DEF_FILE = jsos2$(VERSION_NUMBER).def
|
||||
EXTRA_LIBS = $(LIBNSPR) $(LIBNSJAVA)
|
||||
EXTRA_LIBS = $(NSPR_LIBS) $(LIBNSJAVA)
|
||||
else
|
||||
EXTRA_LIBS = $(LIBNSPR) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
|
||||
EXTRA_LIBS = $(NSPR_LIBS) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
|
||||
endif
|
||||
endif
|
||||
|
||||
MODULE = js
|
||||
|
||||
CSRCS = jsapi.c \
|
||||
jsarena.c \
|
||||
jsarray.c \
|
||||
jsatom.c \
|
||||
jsbool.c \
|
||||
jscntxt.c \
|
||||
jsdate.c \
|
||||
jsdbgapi.c \
|
||||
jsdtoa.c \
|
||||
jsemit.c \
|
||||
jsexn.c \
|
||||
jsfun.c \
|
||||
jsgc.c \
|
||||
jshash.c \
|
||||
jsinterp.c \
|
||||
jslock.c \
|
||||
jslog2.c \
|
||||
jslong.c \
|
||||
jsmath.c \
|
||||
jsnum.c \
|
||||
jsobj.c \
|
||||
jsopcode.c \
|
||||
jsparse.c \
|
||||
jsprf.c \
|
||||
jsregexp.c \
|
||||
jsscan.c \
|
||||
jsscope.c \
|
||||
jsscript.c \
|
||||
jsstr.c \
|
||||
jsutil.c \
|
||||
jsxdrapi.c \
|
||||
prmjtime.c \
|
||||
$(NULL)
|
||||
CSRCS = jsapi.c \
|
||||
jsarena.c \
|
||||
jsarray.c \
|
||||
jsatom.c \
|
||||
jsbool.c \
|
||||
jscntxt.c \
|
||||
jsdate.c \
|
||||
jsdbgapi.c \
|
||||
jsdtoa.c \
|
||||
jsemit.c \
|
||||
jsexn.c \
|
||||
jsfun.c \
|
||||
jsgc.c \
|
||||
jshash.c \
|
||||
jsinterp.c \
|
||||
jslock.c \
|
||||
jslog2.c \
|
||||
jslong.c \
|
||||
jsmath.c \
|
||||
jsnum.c \
|
||||
jsobj.c \
|
||||
jsopcode.c \
|
||||
jsparse.c \
|
||||
jsprf.c \
|
||||
jsregexp.c \
|
||||
jsscan.c \
|
||||
jsscope.c \
|
||||
jsscript.c \
|
||||
jsstr.c \
|
||||
jsutil.c \
|
||||
jsxdrapi.c \
|
||||
prmjtime.c \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS = js.msg \
|
||||
jsapi.h \
|
||||
|
|
@ -116,7 +118,7 @@ EXPORTS = js.msg \
|
|||
jsxdrapi.h \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
# when using gcc the assembly is inlined in the C-file (see jslock.c)
|
||||
ifdef NS_USE_NATIVE
|
||||
|
|
@ -171,12 +173,6 @@ endif # sparc
|
|||
|
||||
INCLUDES += -I$(srcdir)
|
||||
|
||||
ifdef NSPR20
|
||||
INCLUDES += -I$(DIST)/include/nspr20/pr
|
||||
else
|
||||
INCLUDES += -I$(XPDIST)/public/nspr
|
||||
endif
|
||||
|
||||
ifndef NSBUILDROOT
|
||||
JSJAVA_STUBHEADERS = -I$(topsrcdir)/sun-java/include/_gen \
|
||||
-I$(topsrcdir)/sun-java/netscape/javascript/_jri \
|
||||
|
|
@ -189,8 +185,8 @@ JSJAVA_CFLAGS = -I$(topsrcdir)/sun-java/md-include \
|
|||
-I$(topsrcdir)/sun-java/include \
|
||||
$(JSJAVA_STUBHEADERS)
|
||||
|
||||
# LIBNSPR abstracts nspr version, etc. nicely.
|
||||
LDFLAGS = $(LIBNSPR) -lm
|
||||
# NSPR_LIBS abstracts nspr version, etc. nicely.
|
||||
LDFLAGS = $(NSPR_LIBS) -lm
|
||||
|
||||
ifeq ($(OS_ARCH), OSF1)
|
||||
LDFLAGS += -lc_r
|
||||
|
|
@ -220,7 +216,7 @@ $(OBJDIR)/js$(BIN_SUFFIX): $(OBJDIR)/js.o $(LIBRARY)
|
|||
$(LINK_EXE) -OUT:$@ $(OBJDIR)/js.o $(LIBRARIES) $(EXTRA_LIBS)
|
||||
endif
|
||||
|
||||
# hardwire dependencies on jsopcode.def
|
||||
# hardwire dependencies on jsopcode.tbl
|
||||
jsopcode.h jsopcode.c: jsopcode.tbl
|
||||
|
||||
# this section was put in the merged by danda into the
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ endif
|
|||
MODULE = java
|
||||
LIBRARY_NAME = jsj
|
||||
|
||||
REQUIRES = java js applet nspr img util layer
|
||||
REQUIRES = java js applet img util layer
|
||||
ifdef MOZ_OJI
|
||||
REQUIRES += xpcom
|
||||
endif
|
||||
|
|
@ -58,7 +58,7 @@ CPPSRCS = \
|
|||
nsCLiveconnectFactory.cpp
|
||||
endif
|
||||
|
||||
LLIBS=$(LIBNSPR) $(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib
|
||||
LLIBS=$(NSPR_LIBS) $(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib
|
||||
ifdef MOZ_OJI
|
||||
LLIBS += $(DIST)/lib/xpcom32.lib
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -28,15 +28,15 @@ ifndef XCFLAGS
|
|||
OS2_IMPLIB=1
|
||||
LIBRARY = jsxpcom$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
|
||||
DEF_FILE = jsxpcomos2$(VERSION_NUMBER).def
|
||||
EXTRA_LIBS = $(LIBNSPR) $(LIBNSJAVA)
|
||||
EXTRA_LIBS = $(NSPR_LIBS) $(LIBNSJAVA)
|
||||
else
|
||||
EXTRA_LIBS = $(LIBNSPR) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
|
||||
EXTRA_LIBS = $(NSPR_LIBS) $(LIBNSJAVA) $(OBJDIR)/libjs.lib
|
||||
endif
|
||||
endif
|
||||
|
||||
MODULE = jsxpcom
|
||||
|
||||
REQUIRES = xpcom js nspr
|
||||
REQUIRES = xpcom js
|
||||
|
||||
CSRCS = $(NULL)
|
||||
|
||||
|
|
@ -124,13 +124,7 @@ endif
|
|||
|
||||
endif # sparc
|
||||
|
||||
INCLUDES += -I.
|
||||
|
||||
ifdef NSPR20
|
||||
INCLUDES += -I$(DIST)/include/nspr20/pr
|
||||
else
|
||||
INCLUDES += -I$(XPDIST)/public/nspr
|
||||
endif
|
||||
INCLUDES += -I$(srcdir)
|
||||
|
||||
ifndef NSBUILDROOT
|
||||
JSJAVA_STUBHEADERS = -I$(DEPTH)/sun-java/include/_gen \
|
||||
|
|
@ -144,8 +138,8 @@ JSJAVA_CFLAGS = -I$(DEPTH)/sun-java/md-include \
|
|||
-I$(DEPTH)/sun-java/include \
|
||||
$(JSJAVA_STUBHEADERS)
|
||||
|
||||
# LIBNSPR abstracts nspr version, etc. nicely.
|
||||
LDFLAGS += -L$(DIST)/bin -lxpcom -lreg -ljsxpcom -ljs $(LIBNSPR) -lplc21 -lm
|
||||
# NSPR_LIBS abstracts nspr version, etc. nicely.
|
||||
LDFLAGS += -L$(DIST)/bin -lxpcom -lreg -ljsxpcom -ljs $(NSPR_LIBS) -lm
|
||||
|
||||
ifeq ($(OS_ARCH), OSF1)
|
||||
LDFLAGS += -lc_r
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
#!gmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = htmldlgs
|
||||
LIBRARY_NAME = htmldlgs
|
||||
|
||||
CSRCS = htmldlgs.c
|
||||
|
||||
REQUIRES = security dbm nspr img util layer js
|
||||
|
||||
EXPORTS = $(srcdir)/htmldlgs.h
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
#!gmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = lay
|
||||
LIBRARY_NAME = lay
|
||||
|
||||
EXPORTS = laylayer.h layout.h lo_funcs.h
|
||||
|
||||
ifdef DOM
|
||||
EXPORTS += laydom.h laystyle.h
|
||||
endif
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
CSRCS = bullet.c \
|
||||
clipline.c \
|
||||
layarena.c \
|
||||
layblock.c \
|
||||
laybuiltin.c \
|
||||
laycell.c \
|
||||
laycols.c \
|
||||
laydisp.c \
|
||||
layembed.c \
|
||||
layfind.c \
|
||||
layform.c \
|
||||
laygrid.c \
|
||||
layhrule.c \
|
||||
layinfo.c \
|
||||
laylist.c \
|
||||
laymap.c \
|
||||
layobj.c \
|
||||
layscrip.c \
|
||||
layspace.c \
|
||||
laystyle.c \
|
||||
laysub.c \
|
||||
ptinpoly.c \
|
||||
laymocha.c \
|
||||
layjava.c \
|
||||
laylayer.c \
|
||||
layrelay.c \
|
||||
laytrav.c \
|
||||
layfree.c \
|
||||
layimage.c \
|
||||
layout.c \
|
||||
laysel.c \
|
||||
laytable.c \
|
||||
laytags.c \
|
||||
laytext.c \
|
||||
layutil.c \
|
||||
$(NULL)
|
||||
|
||||
ifdef DOM
|
||||
CSRCS +=laydom.c
|
||||
endif
|
||||
|
||||
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 mailto
|
||||
|
||||
ifdef DOM
|
||||
REQUIRES += dom
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifdef MOZ_EDITOR
|
||||
CSRCS += layedit.c \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = streams.cpp \
|
||||
fsfile.cpp \
|
||||
editor.cpp \
|
||||
edtbuf.cpp \
|
||||
edtcmd.cpp \
|
||||
edtele.cpp \
|
||||
edtjava.cpp \
|
||||
edtlist.cpp \
|
||||
edtsave.cpp \
|
||||
edtutil.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
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$(DEPTH)/mocha/include $<
|
||||
else
|
||||
$(OBJDIR)/laymocha.o: laymocha.c
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CC) -Fo$@ -c $(CFLAGS) -I$(DEPTH)/mocha/include $<
|
||||
endif
|
||||
|
||||
$(LIBRARY): $(OBJS)
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
#!gmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = dom
|
||||
LIBRARY_NAME = dom
|
||||
|
||||
REQUIRES = js
|
||||
#ifdef MOZILLA_CLIENT
|
||||
REQUIRES += lay img layer util
|
||||
|
||||
# hack until PERIGNON takes over the world
|
||||
REQUIRES += style
|
||||
#endif
|
||||
|
||||
EXPORTS = $(srcdir)/dom.h $(srcdir)/domstyle.h
|
||||
|
||||
CSRCS = domattr.c \
|
||||
domcore.c \
|
||||
domdoc.c \
|
||||
domelement.c \
|
||||
domnode.c \
|
||||
domstyle.c \
|
||||
domtext.c \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -DDOM
|
||||
|
|
@ -66,7 +66,7 @@ CSRCS = autokr.c \
|
|||
vietnam.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = i18n dbm nspr img util layer pref js
|
||||
REQUIRES = i18n dbm img util layer pref js
|
||||
|
||||
CSRCS += doc_ccc.c fe_ccc.c intlcomp.c mime2fun.c
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,6 @@ CSRCS = \
|
|||
xp_rect.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = layer dbm nspr img util
|
||||
REQUIRES = layer dbm img util
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ CSRCS += \
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
REQUIRES = mime nspr dbm img util layer security pref js julian nls xp network
|
||||
REQUIRES = mime dbm img util layer security pref js julian nls xp network
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
@ -88,8 +88,7 @@ endif
|
|||
# Building the "mimefilt" executable, which reads a message from stdin and
|
||||
# writes HTML to stdout
|
||||
|
||||
FILT_LIBS=-L$(DIST)/lib -L$(DIST)/bin -li18n -lnetwork -lxp \
|
||||
$(NSPR_LDFLAGS) $(NSPR_LIBS)
|
||||
FILT_LIBS=-L$(DIST)/lib -L$(DIST)/bin -li18n -lnetwork -lxp $(NSPR_LIBS)
|
||||
|
||||
$(OBJDIR)/mimefilt: $(FILT_OBJS) $(LIBRARY)
|
||||
@$(MAKE_OBJDIR)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ CSRCS = \
|
|||
dirprefs.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = net msg js dbm nspr img util layer pref ldap security privacy
|
||||
REQUIRES = net msg js dbm img util layer pref ldap security privacy
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = mocha
|
||||
LIBRARY_NAME = mocha
|
||||
|
||||
REQUIRES = lay parse img js style layer applet dbm nspr security \
|
||||
REQUIRES = lay parse img js style layer applet dbm security \
|
||||
htmldlgs util jtools pref caps java libreg softupdt jsdebug \
|
||||
netcache network httpurl plugin plugimpl mocha oji ojiimpl xpcom \
|
||||
layout rdf
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ EXPORTS = pa_parse.h pa_tags.h pa_amp.h
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = nspr dbm img util layer js hook lay style
|
||||
REQUIRES = dbm img util layer js hook lay style
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,6 @@ CSRCS = cslabel.c \
|
|||
picsapi.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = js nspr dbm img layer util pref security httpurl network
|
||||
REQUIRES = js dbm img layer util pref security httpurl network
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ LIBRARY_NAME = pwcac
|
|||
|
||||
CSRCS = pwcacapi.c
|
||||
|
||||
REQUIRES = js nspr dbm img layer util pref security
|
||||
REQUIRES = js dbm img layer util pref security
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ EXPORTS = stystack.h stystruc.h css.h
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = js nspr dbm img util layer
|
||||
REQUIRES = js dbm img util layer
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
@ -61,8 +61,8 @@ endif
|
|||
|
||||
ifdef ENABLE_TESTS
|
||||
test:
|
||||
$(CC) -g -o $(OBJDIR)/style_test $(CFLAGS) -DSS_TEST stystruc.c $(TEST_LIBS) $(NSPR_LDFLAGS) $(NSPR_LIBS)
|
||||
$(CC) -g -o $(OBJDIR)/stack_test $(CFLAGS) -DTEST_STYLESTACK stystack.c $(TEST_LIBS) $(NSPR_LDFLAGS) $(NSPR_LIBS)
|
||||
$(CC) -g -o $(OBJDIR)/style_test $(CFLAGS) -DSS_TEST stystruc.c $(TEST_LIBS) $(NSPR_LIBS)
|
||||
$(CC) -g -o $(OBJDIR)/stack_test $(CFLAGS) -DTEST_STYLESTACK stystack.c $(TEST_LIBS) $(NSPR_LIBS)
|
||||
|
||||
css_test:
|
||||
rm -f $(OBJDIR)/css_test
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ EXPORTS = \
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = nspr htmldlgs img util layer pref security js java net progress network
|
||||
REQUIRES = htmldlgs img util layer pref security js java net progress network
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@ CSRCS = xpform.c
|
|||
# xploele.c
|
||||
# xptabnav.c
|
||||
|
||||
REQUIRES = mariner nspr util img js layer lay style
|
||||
REQUIRES = mariner util img js layer lay style
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -35,6 +35,6 @@ CSRCS = font_metrics.c \
|
|||
parseAFM.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = nspr dbm img util layer js pref java jtools applet
|
||||
REQUIRES = dbm img util layer js pref java jtools applet
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ EXPORTS=xp_linebuf.h
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = js nspr dbm security img util jtools layer java lay style pref rdf privacy parse
|
||||
REQUIRES = js dbm security img util jtools layer java lay style pref rdf privacy parse
|
||||
|
||||
ifeq ($(STAND_ALONE_JAVA),1)
|
||||
CSRCS = xp_qsort.c
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ endif
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = julian nspr nls java libmime security
|
||||
REQUIRES = julian nls java libmime security
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = edtplug
|
||||
LIBRARY_NAME = edtplug
|
||||
|
||||
REQUIRES = java nspr edtplug
|
||||
REQUIRES = java edtplug
|
||||
|
||||
JRI_GEN = netscape.plugin.composer.PluginManager \
|
||||
netscape.plugin.composer.MozillaCallback \
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ EXPORTS = nf.h coremem.h
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = libfont java jtools dbm nspr img layer util pref js htmldlgs security
|
||||
REQUIRES = libfont java jtools dbm img layer util pref js htmldlgs security
|
||||
|
||||
JMC_GEN = Mcf Mcfb Mcfmi Mcrc Mcdoer
|
||||
JMC_GEN_FLAGS = -cimpl
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ LIBRARY_NAME = hook
|
|||
|
||||
CSRCS = hk_conf.c hk_file.c hk_hook.c hk_init.c hk_tag.c
|
||||
|
||||
REQUIRES = libxp util js img layer parse hook pref dbm nspr
|
||||
REQUIRES = libxp util js img layer parse hook pref dbm
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ CSRCS = png.c \
|
|||
pngwutil.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = util nspr
|
||||
REQUIRES = util
|
||||
|
||||
ifndef MOZ_NATIVE_ZLIB
|
||||
REQUIRES += zlib
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ CPPSRCS = ilNetReader.cpp \
|
|||
|
||||
EXPORTS = PIMGCB.h PPSIMGCB.h
|
||||
|
||||
REQUIRES = zlib nspr jpeg util img png xpcom
|
||||
REQUIRES = zlib jpeg util img png xpcom
|
||||
|
||||
ifdef NU_CACHE
|
||||
REQUIRES += cache
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ XFEDIR = $(DEPTH)/cmd/xfe
|
|||
|
||||
CSRCS = prefldap.c icondata.c
|
||||
|
||||
REQUIRES = nspr dbm ldap js pref
|
||||
REQUIRES = dbm ldap js pref
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ srcdir = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
REQUIRES = security nspr
|
||||
REQUIRES = security
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@
|
|||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = pref
|
||||
LIBRARY_NAME = pref
|
||||
|
||||
REQUIRES = libxp js pref nspr dbm security ldap java img layer util
|
||||
REQUIRES = libxp js pref dbm security ldap java img layer util
|
||||
|
||||
ifneq ($(subst /,_,$(shell uname -s)),OS2)
|
||||
CSRCS = unix/unixpref.c
|
||||
|
|
@ -36,7 +36,7 @@ EXPORTS = initpref.js init/all.js init/config.js win/winpref.js os2/os2pref.js
|
|||
OS2_IMPLIB = 1
|
||||
DEF_FILE = xpOS2.def
|
||||
EXTRA_LIBS = $(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib \
|
||||
$(LIBNSPR) \
|
||||
$(NSPR_LIBS) \
|
||||
$(DIST)/lib/libldap.lib $(DIST)/lib/liblber.lib \
|
||||
$(DIST)/lib/libldap.lib $(DIST)/lib/libhash.lib \
|
||||
$(NULL)
|
||||
|
|
@ -44,6 +44,7 @@ endif
|
|||
|
||||
CSRCS += prefapi.c
|
||||
|
||||
|
||||
GARBAGE += unix/jsbuffer.h
|
||||
|
||||
CONFIG_FILES = initpref.js \
|
||||
|
|
@ -84,14 +85,13 @@ CONFIG_FILES += \
|
|||
|
||||
CONFIG_FILES := $(addprefix $(srcdir)/, $(CONFIG_FILES))
|
||||
|
||||
|
||||
##############################
|
||||
# Magic PREF_ generation hacks
|
||||
|
||||
# put auto-generated headers in here
|
||||
HEADER_DEST_DIR = $(srcdir)/prefnames
|
||||
|
||||
# rename .js -> .h
|
||||
# find names of files by stripping path and converting .js -> .h
|
||||
CONFIG_FILE_HEADERS = $(notdir $(CONFIG_FILES:%.js=%.h))
|
||||
|
||||
# strip out the path and add the dest and pref_ prefix
|
||||
|
|
@ -100,22 +100,23 @@ CONFIG_FILE_EXPORTS = $(addprefix $(HEADER_DEST_DIR)/pref_,$(CONFIG_FILE_HEADERS
|
|||
# export these new files so other modules can use them
|
||||
EXPORTS += $(CONFIG_FILE_EXPORTS)
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# VPATH allows us to make the auto-generation rule works for
|
||||
# everything in VPATH (so init/all.js -> pref_all.h etc)
|
||||
VPATH += $(srcdir)/init $(srcdir)/unix
|
||||
# VPATH allows us to make sure the auto-generation rule works for
|
||||
# everything in VPATH (so init/all.js->pref_all.h etc)
|
||||
VPATH += $(srcdir)/init/ $(srcdir)/unix/
|
||||
|
||||
# this comes after rules.mk because rules.mk blows it away
|
||||
INCLUDES += -I$(srcdir)/unix -I./unix
|
||||
|
||||
$(LIBRARY): $(OBJS)
|
||||
|
||||
|
||||
unix/unixpref.c: unix/jsbuffer.h
|
||||
@if test ! -d unix; then rm -f unix && mkdir unix; fi
|
||||
@if test ! -f $@; then $(INSTALL) $(srcdir)/unix/unixpref.c unix/; fi
|
||||
|
||||
|
||||
|
||||
unix/jsbuffer.h: Makefile $(CONFIG_FILES)
|
||||
@if test ! -d unix; then rm -f unix && mkdir unix; fi
|
||||
@echo "/* This is an automatically generated file */" > $@
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = libreg
|
||||
LIBRARY_NAME = reg
|
||||
|
||||
REQUIRES = libreg nspr pref js
|
||||
REQUIRES = libreg pref js
|
||||
|
||||
CSRCS = reg.c VerReg.c vr_stubs.c
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ LIBRARY_NAME = util
|
|||
|
||||
CSRCS = obs.c
|
||||
|
||||
REQUIRES = nspr util
|
||||
REQUIRES = util
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ EXPORTS = nppg.h npglue.h nppriv.h nsMalloc.h
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = lay layer js style applet nspr dbm img util java pref xpcom raptor netcnvts plugin plugimpl oji ojiimpl caps
|
||||
REQUIRES = lay layer js style applet dbm img util java pref xpcom raptor netcnvts plugin plugimpl oji ojiimpl caps
|
||||
|
||||
ifeq ($(subst /,_,$(shell uname -s)),OS2)
|
||||
CPPSRCS = npwplat.cpp
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = progress
|
||||
LIBRARY_NAME = prgrss
|
||||
|
||||
REQUIRES = progress nspr dbm img layer util
|
||||
REQUIRES = progress dbm img layer util
|
||||
|
||||
ifdef MOZ_SMOOTH_PROGRESS
|
||||
REQUIRES += raptor xpcom
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ MODULE = rdf
|
|||
LIBRARY_NAME = $(LITE_PREFIX)rdf
|
||||
LIBXP = $(DIST)/lib/libxp.$(LIB_SUFFIX)
|
||||
|
||||
REQUIRES = nspr dbm java js htmldlgs util img layer pref ldap network parse
|
||||
REQUIRES = dbm java js htmldlgs util img layer pref ldap network parse
|
||||
|
||||
ifdef NU_CACHE
|
||||
REQUIRES += cache
|
||||
|
|
@ -84,8 +84,8 @@ spf2ldif: $(OBJDIR)/spf2ldif
|
|||
|
||||
$(OBJDIR)/test: $(OBJDIR)/test.o $(LIBRARY)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CC) -o $@ $(OBJDIR)/test.o $(LIBRARY) $(LIBNSPR) $(LIBXP) $(LDFLAGS) $(OS_LIBS)
|
||||
$(CC) -o $@ $(OBJDIR)/test.o $(LIBRARY) $(NSPR_LIBS) $(LIBXP) $(LDFLAGS) $(OS_LIBS)
|
||||
|
||||
$(OBJDIR)/spf2ldif: $(SPF_OBJS) $(LIBRARY)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CC) -o $@ $(SPF_OBJS) $(LIBRARY) $(LIBNSPR) $(LIBXP) $(LDFLAGS) $(OS_LIBS)
|
||||
$(CC) -o $@ $(SPF_OBJS) $(LIBRARY) $(NSPR_LIBS) $(LIBXP) $(LDFLAGS) $(OS_LIBS)
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = schedulr
|
||||
LIBRARY_NAME = sched
|
||||
|
||||
REQUIRES = nspr util
|
||||
REQUIRES = util
|
||||
|
||||
LOCAL_INCLUDES = -I$(PUBLIC)/schedulr
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ include $(topsrcdir)/config/config.mk
|
|||
MODULE = softupdate
|
||||
LIBRARY_NAME = softupdate
|
||||
|
||||
REQUIRES = softupdt js java net dbm nspr img util layer pref \
|
||||
REQUIRES = softupdt js java net dbm img util layer pref \
|
||||
jar security lay style libreg network progress base xpcom caps zlib plugin oji ojiimpl
|
||||
|
||||
INCLUDES += -I$(topsrcdir)/base/src
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = xml
|
||||
LIBRARY_NAME = $(LITE_PREFIX)xml
|
||||
|
||||
REQUIRES = nspr img layer util js
|
||||
REQUIRES = img layer util js
|
||||
EXPORTS = $(srcdir)/expat/xmlparse/xmlparse.h
|
||||
|
||||
CSRCS = expat/xmltok/xmltok.c \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ srcdir = @srcdir@
|
|||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
REQUIRES = xmlparse xmltok expat js xmljs nspr
|
||||
REQUIRES = xmlparse xmltok expat js xmljs
|
||||
CSRCS = js.c \
|
||||
$(NULL)
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ PROGRAM = xmljs
|
|||
include $(topsrcdir)/config/rules.mk
|
||||
CFLAGS += -DJSFILE -I$(srcdir)/.
|
||||
|
||||
MYLIBS = -lxmljs -lexpat -lxmltok -ljs $(LIBNSPR) -ldl -lm
|
||||
MYLIBS = -lxmljs -lexpat -lxmltok -ljs $(NSPR_LIBS) -ldl -lm
|
||||
|
||||
js:
|
||||
rm -f $(PROGRAM)
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = zlib
|
||||
LIBRARY_NAME = zlib
|
||||
|
||||
REQUIRES = nspr java
|
||||
REQUIRES = java
|
||||
|
||||
LCFLAGS =
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = java
|
||||
LIBRARY_NAME = stubnj
|
||||
|
||||
REQUIRES = js nspr java
|
||||
REQUIRES = js java
|
||||
|
||||
CSRCS = stubnj.c
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ CSRCS = \
|
|||
EXPORTS= netcache.h mkcache.h mkmemcac.h extcache.h
|
||||
EXPORTS:= $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = network nspr2 dbm util pref js java fileurl security layer img jtools
|
||||
REQUIRES = network dbm util pref js java fileurl security layer img jtools
|
||||
|
||||
ifdef NU_CACHE
|
||||
REQUIRES += \
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ TARGET = $(LIBRARY)
|
|||
LIBRARY_NAME=cache
|
||||
|
||||
MISCDEP = \
|
||||
$(LIBNSPR) \
|
||||
$(NSPR_LIBS) \
|
||||
$(DIST)/lib/dbm32.lib \
|
||||
$(DIST)/lib/libplc21.lib \
|
||||
$(DIST)/lib/xpcom32.lib \
|
||||
|
|
@ -51,14 +51,14 @@ CPPSRCS = nsCacheObject.cpp \
|
|||
nsMemStream.cpp \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = dbm nspr pref js xpcom
|
||||
REQUIRES = dbm pref js xpcom
|
||||
|
||||
LLIBS = \
|
||||
$(DIST)/lib/dbm32.lib \
|
||||
$(DIST)/lib/libplc21.lib \
|
||||
$(DIST)/lib/xpcom32.lib \
|
||||
$(DIST)/lib/libpref.lib \
|
||||
$(LIBNSPR) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ EXPORTS= cstream.h strmutil.h
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = network nspr2 dbm util pref js java fileurl security \
|
||||
REQUIRES = network dbm util pref js java fileurl security \
|
||||
layer img jtools netcnvts
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -67,18 +67,18 @@ ifdef MOZ_MAIL_NEWS
|
|||
EXPORTS += mkldap.h
|
||||
endif # MOZ_MAIL_NEWS
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = ldapurl imap4url jtools progress nspr2 dbm util js parse lay style pref htmldlgs java \
|
||||
REQUIRES = ldapurl imap4url jtools progress dbm util js parse lay style pref htmldlgs java \
|
||||
libfont netcache httpurl cnetinit security img layer netcnvts network \
|
||||
mimetype ldap net
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
REQUIRES += mailbxurl nntpurl pop3url
|
||||
ifdef NU_CACHE
|
||||
REQUIRES += cache
|
||||
endif
|
||||
|
||||
ifdef NU_CACHE
|
||||
REQUIRES += cache
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
REQUIRES += mailbxurl nntpurl pop3url
|
||||
endif
|
||||
|
||||
ifdef MOZ_SMOOTH_PROGRESS
|
||||
|
|
@ -93,7 +93,7 @@ TEST_LIBS = $(LIBRARY) \
|
|||
$(DIST)/lib/libsec-us.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxp.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/nspr.$(LIB_SUFFIX)
|
||||
$(NSPR_LIBS)
|
||||
|
||||
test:
|
||||
$(CC) -g -o $(OBJDIR)/style_test $(CFLAGS) -DSS_TEST stystruc.c $(TEST_LIBS)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ EXPORTS=$(srcdir)/mkformat.h
|
|||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
REQUIRES = nspr2 network img layer util
|
||||
REQUIRES = network img layer util
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ CPPSRCS = \
|
|||
nsNetFactory.cpp \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = raptor js dbm nspr security pref xpcom util img \
|
||||
REQUIRES = raptor js dbm security pref xpcom util img \
|
||||
layer network netcache fileurl ftpurl abouturl \
|
||||
httpurl gophurl remoturl netcnvts
|
||||
|
||||
|
|
|
|||
|
|
@ -57,9 +57,6 @@ EX_LIBS = \
|
|||
$(DIST)/bin/libraptorbase.so \
|
||||
$(DIST)/bin/libgmbaseunix.so \
|
||||
$(DIST)/bin/libsecfree.so \
|
||||
$(DIST)/lib/libplc21.so \
|
||||
$(DIST)/lib/libplds21.so \
|
||||
$(DIST)/lib/libnspr21.so \
|
||||
$(NULL)
|
||||
|
||||
PROGS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
|
||||
|
|
@ -75,7 +72,7 @@ $(OBJDIR)/%.o: %.cpp
|
|||
|
||||
$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
|
||||
$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(OS_LIBS)
|
||||
|
||||
export::
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/abouturl.h
|
||||
|
||||
REQUIRES = netcache network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = netcache network dbm util pref js java fileurl \
|
||||
security layer img httpurl jtools
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/mkcertld.h
|
||||
|
||||
REQUIRES = ldap network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = ldap network dbm util pref js java fileurl \
|
||||
security layer img httpurl
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/dataurl.h
|
||||
|
||||
REQUIRES = network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = network dbm util pref js java fileurl \
|
||||
security layer img httpurl netcnvts
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/fileurl.h
|
||||
|
||||
REQUIRES = network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = network dbm util pref js java fileurl \
|
||||
security layer img httpurl jtools mimetype
|
||||
|
||||
ifdef MOZ_SMOOTH_PROGRESS
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/ftpurl.h
|
||||
|
||||
REQUIRES = network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = network dbm util pref js java fileurl \
|
||||
security layer img httpurl mimetype
|
||||
|
||||
ifdef MOZ_SMOOTH_PROGRESS
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/gophurl.h
|
||||
|
||||
REQUIRES = network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = network dbm util pref js java fileurl \
|
||||
security layer img httpurl remoturl mimetype
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ EXPORTS= mkaccess.h httpurl.h httpauth.h cookies.h
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = netcache network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = netcache network dbm util pref js java fileurl \
|
||||
security layer img httpurl mimetype htmldlgs
|
||||
|
||||
ifdef MOZ_SMOOTH_PROGRESS
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ EXPORTS= imap4pvt.h imap4url.h imapbody.h imaphier.h mkimap4.h
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = util network nspr2 security \
|
||||
REQUIRES = util network security \
|
||||
netcache network nspr2 dbm util pref js java fileurl \
|
||||
security layer img httpurl mimetype htmldlgs
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/jsurl.h
|
||||
|
||||
REQUIRES = network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = network dbm util pref js java fileurl \
|
||||
security layer img httpurl lay parse style
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/mkldap.h
|
||||
|
||||
REQUIRES = ldap progress netcache network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = ldap progress netcache network dbm util pref js java fileurl \
|
||||
security layer img httpurl mimetype htmldlgs
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/mkmailbx.h
|
||||
|
||||
REQUIRES = imap4url netcache network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = imap4url netcache network dbm util pref js java fileurl \
|
||||
security layer img httpurl mimetype htmldlgs
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CPPSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/marimurl.h
|
||||
|
||||
REQUIRES = network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = network dbm util pref js java fileurl \
|
||||
security layer img httpurl
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ EXPORTS= mknews.h mknewsgr.h
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = netcache network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = netcache network dbm util pref js java fileurl \
|
||||
security layer img httpurl mimetype htmldlgs
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/mkpop3.h
|
||||
|
||||
REQUIRES = netcache network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = netcache network dbm util pref js java fileurl \
|
||||
security layer img httpurl mimetype htmldlgs
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/remoturl.h
|
||||
|
||||
REQUIRES = network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = network dbm util pref js java fileurl \
|
||||
security layer img httpurl
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ CSRCS = \
|
|||
|
||||
EXPORTS= $(srcdir)/mksmtp.h
|
||||
|
||||
REQUIRES = netcache network nspr2 dbm util pref js java fileurl \
|
||||
REQUIRES = netcache network dbm util pref js java fileurl \
|
||||
security layer img httpurl mimetype htmldlgs
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ MODULE = privacy
|
|||
EXPORTS = \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = privacy network layer pref style lay rdf nspr util img js htmldlgs
|
||||
REQUIRES = privacy network layer pref style lay rdf util img js htmldlgs
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ CPPSRCS = nsDebug.cpp \
|
|||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
LCFLAGS = -D_IMPL_NS_COM -DUSE_NSREG
|
||||
CFLAGS += -D_IMPL_NS_COM -DUSE_NSREG
|
||||
|
||||
REQUIRES = $(MODULE) libreg
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
#!gmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
|
|
@ -15,65 +14,41 @@
|
|||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
DEPTH=../..
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
DIRS = dynamic
|
||||
|
||||
CPPSRCS = \
|
||||
RegFactory.cpp \
|
||||
TestFactory.cpp \
|
||||
$(NULL)
|
||||
|
||||
INCLUDES=-I$(srcdir)/../public -I$(DIST)/include
|
||||
|
||||
ifndef NO_SHARED_LIB
|
||||
DIRS = dynamic
|
||||
endif
|
||||
|
||||
OBJS = $(CPPSRCS:.cpp=.o)
|
||||
|
||||
EX_LIBS =
|
||||
|
||||
ifndef NO_SHARED_LIB
|
||||
EX_LIBS += \
|
||||
$(DIST)/bin/libreg.$(DLL_SUFFIX) \
|
||||
$(DIST)/bin/libxpcom.$(DLL_SUFFIX)
|
||||
else
|
||||
ifndef NO_STATIC_LIB
|
||||
EX_LIBS += \
|
||||
$(DIST)/lib/libreg.a \
|
||||
$(DIST)/lib/libxpcom.a
|
||||
endif
|
||||
endif
|
||||
|
||||
EX_LIBS += \
|
||||
$(DIST)/lib/libplc21.a \
|
||||
$(DIST)/lib/libplds21.a \
|
||||
$(DIST)/lib/libnspr21.a \
|
||||
$(NULL)
|
||||
|
||||
PROGS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
|
||||
|
||||
NON_DIRS = $(PROGS)
|
||||
TARGETS = $(NON_DIRS)
|
||||
CPPSRCS = RegFactory.cpp TestFactory.cpp
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
$(OBJDIR)/%.o: %.cpp
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCC) -o $@ $(CFLAGS) -DUSE_NSREG -c $<
|
||||
CFLAGS += -DUSE_NSREG
|
||||
INCLUDES = -I$(srcdir)/../public -I$(DIST)/include
|
||||
|
||||
EX_LIBS = $(DIST)/lib/libxpcom.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libreg.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
OS_LIBS += $(NSPR_LIBS)
|
||||
|
||||
PROGS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
|
||||
|
||||
TARGETS = $(PROGS)
|
||||
|
||||
ifeq ($(OS_ARCH),Rhapsody)
|
||||
$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
|
||||
else
|
||||
$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
|
||||
|
||||
export::
|
||||
endif
|
||||
|
||||
install:: $(PROGS)
|
||||
$(INSTALL) $(PROGS) $(DIST)/bin
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче