зеркало из https://github.com/mozilla/gecko-dev.git
Updates to autoconf files.
This commit is contained in:
cls%seawood.org
Родитель
93810b51e8
Коммит
9020b80c52
|
|
@ -25,7 +25,11 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
REQUIRES = nspr xpcom security layer js jar zlib pref img util rdf caps
|
||||
REQUIRES = nspr xpcom security layer js jar pref img util rdf caps
|
||||
|
||||
ifndef MOZ_NATIVE_ZLIB
|
||||
REQUIRES += zlib
|
||||
endif
|
||||
|
||||
CSRCS = \
|
||||
nsZip.c \
|
||||
|
|
|
|||
|
|
@ -17,11 +17,14 @@
|
|||
|
||||
DEPTH = ..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
DIRS = $(addsuffix fe, $(MOZ_FE)) patcher
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -233,8 +233,10 @@ XFE_WIDGETS_LIB = $(DIST)/lib/libXfeWidgets.a
|
|||
XFE_WIDGETS_BM_LIB = $(DIST)/lib/libXfeBm.a
|
||||
|
||||
ifneq ($(OS_ARCH),IRIX)
|
||||
ifneq ($(OS_ARCH),FreeBSD)
|
||||
DYNAMIC_SYMBOLS_F = -rdynamic # default
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_ARCH),SunOS)
|
||||
ifdef NS_USE_NATIVE
|
||||
DYNAMIC_SYMBOLS_F = -Bdynamic
|
||||
|
|
@ -242,6 +244,9 @@ else
|
|||
DYNAMIC_SYMBOLS_F = # nothing for gcc
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_ARCH),OSF1)
|
||||
DYNAMIC_SYMBOLS_F =
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
NSPR_LIB =
|
||||
|
|
@ -318,18 +323,18 @@ BASIC_LIBS += \
|
|||
$(DIST)/lib/libreg.a \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_NATIVE_PNG
|
||||
BASIC_LIBS += -lpng
|
||||
else
|
||||
BASIC_LIBS += $(DIST)/lib/libpng.a
|
||||
endif
|
||||
|
||||
ifdef MOZ_NATIVE_JPEG
|
||||
BASIC_LIBS += -ljpeg
|
||||
else
|
||||
BASIC_LIBS += $(DIST)/lib/libjpeg.a
|
||||
endif
|
||||
|
||||
ifdef MOZ_NATIVE_PNG
|
||||
BASIC_LIBS += -lpng
|
||||
else
|
||||
BASIC_LIBS += $(DIST)/lib/libpng.a
|
||||
endif
|
||||
|
||||
BASIC_LIBS_2 = \
|
||||
$(DIST)/lib/lib$(LITE_PREFIX)xp.a \
|
||||
$(DIST)/lib/libdbm.a \
|
||||
|
|
@ -338,6 +343,17 @@ BASIC_LIBS_2 = \
|
|||
$(DIST)/lib/lib$(LITE_PREFIX)rdf.a \
|
||||
$(NULL)
|
||||
|
||||
|
||||
# jwz: link in libmime all the time.
|
||||
# but it needs to be before libnetutil, and I don't know how to do that,
|
||||
# so just link against libnetutil twice.
|
||||
|
||||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libmime.a \
|
||||
$(DIST)/lib/libnetutil.a \
|
||||
$(NULL)
|
||||
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
ifdef MOZ_SECURITY
|
||||
BASIC_LIBS += \
|
||||
|
|
@ -370,8 +386,7 @@ ifdef MOZ_SECURITY
|
|||
BASIC_LIBS += $(DIST)/lib/libmsg.a \
|
||||
$(NULL)
|
||||
endif
|
||||
BASIC_LIBS += $(DIST)/lib/libmime.a \
|
||||
$(DIST)/lib/libaddr.a \
|
||||
BASIC_LIBS += $(DIST)/lib/libaddr.a \
|
||||
$(DIST)/lib/libneo.a \
|
||||
$(DIST)/lib/libaddr.a \
|
||||
$(NULL)
|
||||
|
|
@ -435,8 +450,6 @@ endif
|
|||
BASIC_LIBS += \
|
||||
$(DIST)/lib/libnsn.a \
|
||||
$(DIST)/lib/libnsc.a \
|
||||
$(DIST)/lib/libcaps.a \
|
||||
$(DIST)/lib/libxpcom.a \
|
||||
$(DIST)/lib/libjpw.a \
|
||||
$(DIST)/lib/libzpw.a \
|
||||
$(DIST)/lib/libiawt.a \
|
||||
|
|
@ -638,16 +651,16 @@ EXPORT_LDFLAGS =\
|
|||
$(EXPORT_LIB) \
|
||||
$(BASIC_LIBS_2) \
|
||||
$(BASIC_DSOS) \
|
||||
$(OTHER_LIBS) \
|
||||
$(NSPR_LIB)
|
||||
$(NSPR_LIB) \
|
||||
$(OTHER_LIBS)
|
||||
|
||||
EXPORT_DYN_MOTIF_LDFLAGS =\
|
||||
$(BASIC_LIBS) \
|
||||
$(EXPORT_LIB) \
|
||||
$(BASIC_LIBS_2) \
|
||||
$(BASIC_DSOS) \
|
||||
$(OTHER_DYN_MOTIF_LIBS) \
|
||||
$(NSPR_LIB)
|
||||
$(NSPR_LIB) \
|
||||
$(OTHER_DYN_MOTIF_LIBS)
|
||||
|
||||
EXPORT_DEPLIBS =\
|
||||
$(BASIC_LIBS) \
|
||||
|
|
@ -690,6 +703,12 @@ ifeq ($(OS_ARCH),FreeBSD)
|
|||
OTHER_LIBS = /usr/X11R6/lib/libXm.a -L/usr/X11R6/lib -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
|
||||
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
|
||||
|
||||
########################################
|
||||
# BSDI
|
||||
ifeq ($(OS_ARCH),BSD_OS)
|
||||
|
|
@ -724,10 +743,6 @@ HPUX_RESOURCE_HACK = -Wp,-H16384
|
|||
|
||||
OTHER_LIBS = $(HPUX_XLIBS) -lXm -L$(DIST)/lib -lXmu -lXt -lX11 -lXext $(OS_LIBS)
|
||||
|
||||
ifdef NS_USE_GCC
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
endif
|
||||
|
||||
ifndef NO_EDITOR
|
||||
|
||||
ifdef NS_USE_GCC
|
||||
|
|
@ -793,6 +808,13 @@ endif
|
|||
# Linux
|
||||
ifeq ($(OS_ARCH),Linux)
|
||||
|
||||
# Override the definition of OS_LIBS in config/Linux.mk.
|
||||
ifeq ($(USE_PTHREADS),1)
|
||||
OS_LIBS = -lpthread -lm -ldl -lc
|
||||
else
|
||||
OS_LIBS = -lm -ldl
|
||||
endif
|
||||
|
||||
XFE_MOTIF_LDFLAGS =\
|
||||
$(MOZILLA_XFE_GLIBC_BROKEN_LOCALE_FLAGS) \
|
||||
$(MOZILLA_XFE_MOTIF_STATIC_FLAGS) \
|
||||
|
|
@ -810,8 +832,7 @@ XFE_X11_LDFLAGS =\
|
|||
OTHER_LIBS =\
|
||||
$(XFE_MOTIF_LDFLAGS) \
|
||||
$(XFE_X11_LDFLAGS) \
|
||||
-lm \
|
||||
-ldl
|
||||
$(OS_LIBS)
|
||||
|
||||
# Dynamic motif binary
|
||||
ifdef MOZILLA_XFE_MOTIF_HAVE_DYNAMIC_LIB
|
||||
|
|
@ -831,8 +852,7 @@ PLUGIN_DSO += $(DIST)/bin/libnullplugin-dynMotif.so
|
|||
OTHER_DYN_MOTIF_LIBS =\
|
||||
$(XFE_DYN_MOTIF_LDFLAGS) \
|
||||
$(XFE_X11_LDFLAGS) \
|
||||
-lm \
|
||||
-ldl
|
||||
$(OS_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -874,8 +894,6 @@ ifeq ($(OS_ARCH),OSF1)
|
|||
#
|
||||
OTHER_LIBS = -lXm -lXmu -lXt -lX11 -lXext -ldnet_stub -lm -lots $(OS_LIBS)
|
||||
|
||||
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
########################################
|
||||
|
|
@ -963,7 +981,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) $(OTHER_LIBS) $(NSPR_LIB)
|
||||
$(BASIC_DSOS) $(NSPR_LIB) $(OTHER_LIBS)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
|
@ -982,7 +1000,13 @@ EXPORT_LDFLAGS += -lresolv -lsocket -lc /usr/ucblib/libucb.a
|
|||
|
||||
endif
|
||||
|
||||
#######################################################################
|
||||
########################################
|
||||
# Data General DG/UX
|
||||
ifeq ($(OS_ARCH),dgux)
|
||||
|
||||
OTHER_LIBS = $(MOTIFLIB) $(OS_LIBS)
|
||||
|
||||
endif
|
||||
|
||||
ifdef USE_AUTOCONF
|
||||
OTHER_LIBS = $(FE_X_LIBS) $(ACLFLAGS) $(ACLIBS)
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@
|
|||
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
@ -86,3 +86,4 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += $(XFE_EXTRA_DEFINES)
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
@ -40,9 +40,17 @@ TEST_DIRS = \
|
|||
endif
|
||||
endif
|
||||
|
||||
ifdef XFE_WIDGETS_BUILD_UNUSED
|
||||
UNUSED_DIRS = \
|
||||
XfeCaption \
|
||||
XfeComboBox \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
DIRS = \
|
||||
Xfe \
|
||||
XfeBm \
|
||||
$(UNUSED_DIRS) \
|
||||
$(TEST_DIRS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -33,8 +33,9 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
ifdef XFE_WIDGETS_BUILD_UNUSED
|
||||
UNUSED_DIRS = \
|
||||
XfeComboBox \
|
||||
XfeCaption \
|
||||
XfeComboBox \
|
||||
XfeToolTip \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ CPPSRCS = \
|
|||
HTMLView.cpp \
|
||||
HistoryFrame.cpp \
|
||||
IconGroup.cpp \
|
||||
Image.cpp \
|
||||
LocationDrag.cpp \
|
||||
Logo.cpp \
|
||||
Menu.cpp \
|
||||
|
|
@ -112,7 +113,6 @@ CPPSRCS = \
|
|||
MozillaApp.cpp \
|
||||
NavCenterFrame.cpp \
|
||||
NavCenterView.cpp \
|
||||
RDFImage.cpp \
|
||||
Netcaster.cpp \
|
||||
NotificationCenter.cpp \
|
||||
Outliner.cpp \
|
||||
|
|
@ -128,7 +128,9 @@ CPPSRCS = \
|
|||
PrefsDialogMailnews.cpp \
|
||||
PrefsLang.cpp \
|
||||
PrefsProxiesView.cpp \
|
||||
RDFImage.cpp \
|
||||
RDFView.cpp \
|
||||
RDFTreeView.cpp \
|
||||
RadioGroup.cpp \
|
||||
Splash.cpp \
|
||||
Toolbar.cpp \
|
||||
|
|
@ -291,6 +293,10 @@ ifdef XFE_PREF_ADVANCED_PASSIVE_FTP
|
|||
DEFINES += -DXFE_PREF_ADVANCED_PASSIVE_FTP
|
||||
endif
|
||||
|
||||
ifdef XFE_FILE_BOOKMARK_IN_LINK_CONTEXT_MENU
|
||||
DEFINES += -DXFE_FILE_BOOKMARK_IN_LINK_CONTEXT_MENU
|
||||
endif
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
CPPSRCS += \
|
||||
TextEditorView.cpp \
|
||||
|
|
|
|||
|
|
@ -90,10 +90,11 @@ $(OBJDIR)/gtscc$(BIN_SUFFIX): $(OBJDIR)/gtscc.o
|
|||
$(INSTALL) -m 444 $@ $(DIST)/bin
|
||||
|
||||
#update build number from within make script
|
||||
$(DEPTH)/build/build_number: $(OBJDIR)/bdate$(BIN_SUFFIX) FORCE
|
||||
$(DEPTH)/build/build_number: FORCE
|
||||
@$(MAKE_OBJDIR)
|
||||
$(RM) $@
|
||||
$(OBJDIR)/bdate$(BIN_SUFFIX) > $@
|
||||
$(PERL) $(srcdir)/bdate.pl > $@
|
||||
$(PERL) $(srcdir)/aboutime.pl $(DEPTH)/l10n/us/xp/about-all.html $@
|
||||
|
||||
$(OBJDIR)/bdate$(BIN_SUFFIX): $(OBJDIR)/bdate.o
|
||||
@$(MAKE_OBJDIR)
|
||||
|
|
|
|||
17
configure.in
17
configure.in
|
|
@ -55,7 +55,7 @@ AC_PROG_INSTALL
|
|||
AC_PROG_AWK
|
||||
AC_PROG_RANLIB
|
||||
|
||||
AC_PATH_PROGS(EMACS, xemacs emacs, /bin/true)
|
||||
AC_PATH_PROGS(EMACS, xemacs lemacs emacs, /bin/true)
|
||||
AC_PATH_PROG(PERL, perl, /bin/true)
|
||||
AC_PATH_PROG(WHOAMI, whoami, /bin/true)
|
||||
AC_PATH_PROG(UNZIP, unzip, /bin/true)
|
||||
|
|
@ -186,7 +186,7 @@ dnl ========================================================
|
|||
AC_CHECK_LIB(c, strcpy)
|
||||
AC_CHECK_LIB(m, atan)
|
||||
AC_CHECK_LIB(dl, dlopen)
|
||||
AC_CHECK_LIB(thread, thread_create)
|
||||
AC_CHECK_LIB(thread, thr_create)
|
||||
AC_CHECK_LIB(pthread, pthread_create)
|
||||
AC_CHECK_LIB(pcthreads, pthread_create)
|
||||
AC_CHECK_LIB(resolv, res_gethostbyaddr)
|
||||
|
|
@ -236,7 +236,17 @@ dnl Mozilla specific options
|
|||
dnl ========================================================
|
||||
AC_ARG_ENABLE(fe,
|
||||
[ --enable-fe=\$val enable \$val fe (defaults to x)],
|
||||
[fe_list=`echo "$enableval" | sed -e 's/,/ /g' -e 's|$| |'`], fe_list="x ")
|
||||
[fe_list=`echo "$enableval" | sed -e 's/,/ /g' -e 's|$| |'`],
|
||||
fe_list=USE_DEFAULT)
|
||||
|
||||
if [ test "$fe_list" = "USE_DEFAULT" ]; then
|
||||
res=`echo $target_os| grep -c "^Rhapsody"`
|
||||
if [ test $res != 0 ]; then
|
||||
fe_list="yb "
|
||||
else
|
||||
fe_list="x "
|
||||
fi
|
||||
fi
|
||||
|
||||
for fe in $fe_list; do
|
||||
# Test whether such a subdir really exists.
|
||||
|
|
@ -648,7 +658,6 @@ modules/Makefile
|
|||
modules/calendar/Makefile
|
||||
modules/calendar/src/Makefile
|
||||
modules/calendar/src/libcal/Makefile
|
||||
modules/coreincl/Makefile
|
||||
modules/edtplug/Makefile
|
||||
modules/edtplug/classes/Makefile
|
||||
modules/edtplug/classes/netscape/Makefile
|
||||
|
|
|
|||
|
|
@ -110,8 +110,6 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
export:: install
|
||||
|
||||
ifndef BUILD_OPT
|
||||
MOCHAFILE = 1
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
|
||||
DEPTH = ..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
@ -42,8 +42,10 @@ endif
|
|||
|
||||
DIRS += libparse xlate xp
|
||||
|
||||
DIRS += libmime
|
||||
|
||||
ifdef MOZ_MAIL_NEWS
|
||||
DIRS += libaddr libmime
|
||||
DIRS += libaddr
|
||||
endif
|
||||
|
||||
DIRS += htmldlgs
|
||||
|
|
@ -66,11 +68,10 @@ DIRS += libpwcac
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifndef USE_AUTOCONF
|
||||
|
||||
# This is a kludge so that running "make netscape-us" in this directory
|
||||
# will rebuild the subdirectories, and then relink ../../cmd/xfe/netscape-us
|
||||
#
|
||||
junk=export libs install
|
||||
netscape-us netscape-export nav-us nav-export netscape-us.pure netscape-export.pure: $(junk)
|
||||
cd $(DEPTH)/cmd/xfe; $(MAKE) $@
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ 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 htmldigs privacy
|
||||
REQUIRES = parse style js layer applet nspr security dbm img util jtools edtplug java hook pref libfont lay rdf network htmldlgs privacy
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
@ -63,6 +63,7 @@ CSRCS = autokr.c \
|
|||
kinsokud.c \
|
||||
kinsokuf.c \
|
||||
katakana.c \
|
||||
vietnam.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = i18n dbm nspr img util layer pref js
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
@ -54,10 +54,13 @@ CSRCS = \
|
|||
mimetpla.c \
|
||||
mimetric.c \
|
||||
mimeunty.c \
|
||||
mimevcrd.c \
|
||||
addr.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = mime nspr dbm img util layer security pref js julian nls
|
||||
# mimevcrd.c \
|
||||
|
||||
|
||||
REQUIRES = mime nspr dbm img util layer security pref js julian nls xp network
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
@ -69,55 +72,25 @@ INCLUDES += -I$(DEPTH)/lib/libmime -I$(DIST)/public/security
|
|||
endif
|
||||
|
||||
INCLUDES += -I$(srcdir)/
|
||||
|
||||
DEFINES += -DMOZILLA_30 -DNO_SECURITY
|
||||
|
||||
#
|
||||
# Building the "mimefilt" executable, which reads a message from stdin and
|
||||
# writes HTML to stdout
|
||||
#
|
||||
LIBMSG_DIR = ../libmsg
|
||||
LIBXP_DIR = ../xp
|
||||
LIBXP_BIN_DIR = $(LIBXP_DIR)/$(OBJDIR)
|
||||
LIBMSG_BIN_DIR = $(LIBMSG_DIR)/$(OBJDIR)
|
||||
|
||||
EXT_OBJECTS = $(LIBMSG_BIN_DIR)/addr.o \
|
||||
$(LIBXP_BIN_DIR)/xp_file.o \
|
||||
$(LIBXP_BIN_DIR)/xp_str.o \
|
||||
$(LIBXP_BIN_DIR)/xp_intl.o \
|
||||
$(LIBXP_BIN_DIR)/xp_error.o \
|
||||
$(LIBXP_BIN_DIR)/xp_trace.o \
|
||||
$(LIBXP_BIN_DIR)/xp_reg.o \
|
||||
$(LIBXP_BIN_DIR)/xp_hash.o \
|
||||
$(LIBXP_BIN_DIR)/xp_list.o \
|
||||
$(NULL)
|
||||
FILT_LIBS=-L$(DIST)/lib -L$(DIST)/bin -li18n -lnetwork -lxp \
|
||||
-lnspr21 -lplc21 -lplds21
|
||||
|
||||
FILT_STUBS = $(EXT_OBJECTS) \
|
||||
$(LIBXP_BIN_DIR)/allxpstr.o \
|
||||
$(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsecmod.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcert.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libkey.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libhash.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libssl.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcrypto.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libaddr.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnspr.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
$(EXT_OBJECTS):
|
||||
@cd $(shell dirname $@)/../ ; \
|
||||
$(MAKE_OBJDIR) ; \
|
||||
$(MAKE) $(subst $(LIBXP_BIN_DIR)/,,$(subst $(LIBMSG_BIN_DIR)/,,$@))
|
||||
|
||||
$(OBJDIR)/mimefilt: $(FILT_OBJS) $(LIBRARY) $(FILT_STUBS)
|
||||
$(OBJDIR)/mimefilt: $(FILT_OBJS) $(LIBRARY)
|
||||
@$(MAKE_OBJDIR)
|
||||
rm -f $@
|
||||
$(CC) -o $@ $(CFLAGS) $(FILT_OBJS) $(LIBRARY) $(FILT_STUBS) $(LDFLAGS)
|
||||
$(CC) -o $@ $(CFLAGS) $(FILT_OBJS) $(LIBRARY) $(FILT_LIBS) $(LDFLAGS)
|
||||
|
||||
$(OBJDIR)/mimefilt.pure: $(LIBRARY) $(FILT_OBJS) $(FILT_STUBS)
|
||||
$(OBJDIR)/mimefilt.pure: $(LIBRARY) $(FILT_OBJS)
|
||||
@$(MAKE_OBJDIR)
|
||||
rm -f $@
|
||||
$(PURIFY) $(CC) -o $@ $(NOMD_CFLAGS) $(FILT_OBJS) $(LIBRARY) $(FILT_STUBS) $(LDFLAGS)
|
||||
$(PURIFY) $(CC) -o $@ $(NOMD_CFLAGS) $(FILT_OBJS) $(LIBRARY) $(FILT_LIBS) $(LDFLAGS)
|
||||
|
||||
TAGS:: $(LIB_SRCS) $(FILT_SRCS) $(HEADERS)
|
||||
$(ETAGS) $(LIB_SRCS) $(FILT_SRCS) $(HEADERS)
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
@ -46,6 +46,7 @@ CSRCS = \
|
|||
xp_wrap.c \
|
||||
xpassert.c \
|
||||
xplocale.c \
|
||||
xp_linebuf.c \
|
||||
$(NULL)
|
||||
else
|
||||
CSRCS = xp_stub.c
|
||||
|
|
@ -58,6 +59,10 @@ CSRCS += \
|
|||
allxpstr.c \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS=xp_linebuf.h
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
REQUIRES = js nspr dbm security img util jtools layer java lay style pref rdf privacy
|
||||
|
||||
ifeq ($(STAND_ALONE_JAVA),1)
|
||||
|
|
@ -70,7 +75,7 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EMACS = lemacs
|
||||
#EMACS = lemacs
|
||||
|
||||
AUDIO_FILES = $(wildcard $(srcdir)/*.au)
|
||||
GIF_FILES = $(wildcard $(srcdir)/*.gif)
|
||||
|
|
|
|||
|
|
@ -17,12 +17,13 @@
|
|||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
ifdef JAVA_OR_NSJVM
|
||||
DIRS = netscape
|
||||
else
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -42,7 +42,11 @@ CSRCS = png.c \
|
|||
pngwutil.c \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = util nspr zlib
|
||||
REQUIRES = util nspr
|
||||
|
||||
ifndef MOZ_NATIVE_ZLIB
|
||||
REQUIRES += zlib
|
||||
endif
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ EXPORTS = PIMGCB.h PPSIMGCB.h
|
|||
|
||||
REQUIRES = zlib nspr jpeg util img png xpcom
|
||||
|
||||
LOCAL_INCLUDES = -I../png -I. -I$(DEPTH)/dist/public/zlib
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../png -I$(srcdir) -I$(DEPTH)/dist/public/zlib
|
||||
|
||||
EXTRA_LIBS = $(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a $(DIST)/lib/libnspr21.a $(dist)/lib/libjpeg.a $(DIST)/lib/libplc21.a $(DIST)/lib/libutil.a
|
||||
|
||||
|
|
@ -81,25 +81,29 @@ EXPORTS = PIMGCB.h PPSIMGCB.h
|
|||
|
||||
REQUIRES = jtools java nspr dbm util img layer js xpcom
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../png -I$(srcdir)/.
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)
|
||||
EXTRA_LIBS =
|
||||
|
||||
ifndef MOZ_NATIVE_JPEG
|
||||
REQUIRES += jpeg
|
||||
endif
|
||||
|
||||
ifndef MOZ_NATIVE_ZLIB
|
||||
ifdef MOZ_NATIVE_PNG
|
||||
EXTRA_LIBS += -lpng
|
||||
else
|
||||
REQUIRES += png
|
||||
LOCAL_INCLUDES += -I$(srcdir)/../png
|
||||
EXTRA_LIBS += $(DIST)/lib/libpng.a
|
||||
endif
|
||||
|
||||
ifdef MOZ_NATIVE_ZLIB
|
||||
EXTRA_LIBS += -lz
|
||||
else
|
||||
REQUIRES += zlib
|
||||
LOCAL_INCLUDES += -I$(DEPTH)/dist/public/zlib
|
||||
EXTRA_LIBS += $(DIST)/lib/libzlib.a
|
||||
endif
|
||||
|
||||
ifndef MOZ_NATIVE_PNG
|
||||
REQUIRES += png
|
||||
EXTRA_LIBS += $(DIST)/lib/libpng.a
|
||||
endif
|
||||
|
||||
#
|
||||
# Generate MIMGCB.c (and similar sources) here.
|
||||
# MIMGCB.h is generated in ../public/_jmc/
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ ifdef POLARIS
|
|||
SHARED_LIBRARY = $(OBJDIR)/libAutoAdmin.so
|
||||
endif
|
||||
|
||||
FEDIR = $(DEPTH)/cmd/xfe
|
||||
XFEDIR = $(DEPTH)/cmd/xfe
|
||||
|
||||
CSRCS = prefldap.c icondata.c
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ REQUIRES = nspr dbm ldap js pref
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(topsrcdir)/cmd/xfe/icons -I$(FEDIR)/icons/$(OBJDIR)
|
||||
INCLUDES += -I$(topsrcdir)/cmd/xfe/icons -I$(DEPTH)/cmd/xfe/icons/$(OBJDIR)
|
||||
DEFINES += -DPOLARIS
|
||||
GARBAGE += icondata.c
|
||||
|
||||
|
|
@ -51,5 +51,5 @@ polaris: $(SHARED_LIBRARY)
|
|||
|
||||
icondata.c:
|
||||
@rm -f icondata.c $(NOSUCHFILE)
|
||||
@cd $(FEDIR)/icons; $(MAKE)
|
||||
@ln -s $(FEDIR)/icons/$(OBJDIR)/icondata.c $@
|
||||
@cd $(XFEDIR)/icons; $(MAKE)
|
||||
@ln -s $(XFEDIR)/icons/$(OBJDIR)/icondata.c $@
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ CPPSRCS = \
|
|||
nsPluginStreamPeer.cpp \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = raptor plugin java xpcom netlib
|
||||
REQUIRES = raptor plugin java xpcom netlib libplc21
|
||||
|
||||
LCFLAGS =-D_IMPL_NS_PLUGIN
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ CPPSRCS = \
|
|||
nsPluginStreamPeer.cpp \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = raptor plugin java xpcom netlib
|
||||
REQUIRES = raptor plugin java xpcom netlib libplc21
|
||||
|
||||
LCFLAGS =-D_IMPL_NS_PLUGIN
|
||||
|
||||
|
|
|
|||
|
|
@ -18,11 +18,10 @@
|
|||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = xml
|
||||
LIBRARY_NAME = $(LITE_PREFIX)xml
|
||||
|
||||
|
|
@ -41,4 +40,9 @@ LOCAL_INCLUDES = -I$(srcdir)/expat/xmltok -I$(srcdir)/expat/xmlparse/ -I$(srcdir
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH),Rhapsody)
|
||||
CFLAGS += -traditional-cpp
|
||||
endif
|
||||
|
||||
$(LIBRARY): $(OBJS)
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
|
||||
DEPTH = ..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,8 @@ EXPORTS = nsIStreamListener.h \
|
|||
nsIPostToServer.h \
|
||||
nsIHttpUrl.h \
|
||||
nsINetContainerApplication.h \
|
||||
nsIRefreshUrl.h \
|
||||
nsIConnectionInfo.h \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
|
|
|||
|
|
@ -27,13 +27,18 @@ LIBRARY_NAME = netutil
|
|||
|
||||
CSRCS = \
|
||||
mkreg.c \
|
||||
mkbuf.c \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS=$(srcdir)/mkreg.h
|
||||
EXPORTS=mkreg.h mkbuf.h
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
REQUIRES = network
|
||||
REQUIRES = network xp
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -217,6 +217,10 @@ ifeq ($(OS_ARCH),BSD_OS)
|
|||
EXTRA_LIBS = -ldl
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),dgux)
|
||||
EXTRA_LIBS = -lsocket -lnsl -ldl
|
||||
endif
|
||||
|
||||
#####################################################
|
||||
#
|
||||
# The rules
|
||||
|
|
|
|||
|
|
@ -112,6 +112,10 @@ ifeq ($(OS_ARCH),NCR)
|
|||
MDCPUCFG_H = _ncr.cfg
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),dgux)
|
||||
MDCPUCFG_H = _dgux.cfg
|
||||
endif
|
||||
|
||||
export:: $(HEADERS) $(MDCPUCFG_H)
|
||||
$(INSTALL) -m 444 $(HEADERS) $(DIST)/include/md
|
||||
$(INSTALL) -m 444 $(srcdir)/$(MDCPUCFG_H) $(DIST)/include
|
||||
|
|
|
|||
|
|
@ -110,6 +110,10 @@ SCOOS_CSRCS = \
|
|||
scoos.c \
|
||||
$(NULL)
|
||||
|
||||
DGUX_CSRCS = \
|
||||
dgux.c \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(PTHREADS_USER),1)
|
||||
CSRCS += $(PTH_USER_CSRCS)
|
||||
endif
|
||||
|
|
@ -168,6 +172,9 @@ endif
|
|||
ifeq ($(OS_ARCH),SCOOS)
|
||||
CSRCS += $(SCOOS_CSRCS)
|
||||
endif
|
||||
ifeq ($(OS_ARCH),dgux)
|
||||
CSRCS += $(DGUX_CSRCS)
|
||||
endif
|
||||
|
||||
#
|
||||
# Some Unix platforms have an assembly language file.
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ MODULE = privacy
|
|||
EXPORTS = \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = privacy network layer pref style lay rdf nspr util img js
|
||||
REQUIRES = privacy network layer pref style lay rdf nspr util img js htmldlgs
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче