From bde336e65ab6a200f7cf8076766b993cfdff56ba Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Wed, 26 Aug 1998 04:04:57 +0000 Subject: [PATCH] Updates to autoconf files. git-svn-id: svn://10.0.0.236/trunk@8491 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/caps/include/Makefile.in | 2 +- mozilla/caps/src/Makefile.in | 8 +- mozilla/cmd/Makefile.in | 7 +- mozilla/cmd/stubfe/Makefile.in | 1225 ++++-------------- mozilla/cmd/xfe/Makefile.in | 82 +- mozilla/cmd/xfe/Microline3.0/XmL/Makefile.in | 5 +- mozilla/cmd/xfe/XfeWidgets/Makefile.in | 12 +- mozilla/cmd/xfe/XfeWidgets/tests/Makefile.in | 3 +- mozilla/cmd/xfe/src/Makefile.in | 8 +- mozilla/config/Makefile.in | 5 +- mozilla/configure.in | 17 +- mozilla/js/src/Makefile.in | 2 - mozilla/lib/Makefile.in | 9 +- mozilla/lib/layout/Makefile.in | 12 +- mozilla/lib/libi18n/Makefile.in | 3 +- mozilla/lib/libmime/Makefile.in | 59 +- mozilla/lib/xp/Makefile.in | 23 +- mozilla/modules/edtplug/classes/Makefile.in | 3 +- mozilla/modules/libimg/Makefile.in | 2 +- mozilla/modules/libimg/png/Makefile.in | 6 +- mozilla/modules/libimg/src/Makefile.in | 26 +- mozilla/modules/libpref/admin/Makefile.in | 10 +- mozilla/modules/plugin/base/src/Makefile.in | 2 +- mozilla/modules/plugin/nglsrc/Makefile.in | 2 +- mozilla/modules/xml/Makefile.in | 8 +- mozilla/network/Makefile.in | 4 +- mozilla/network/cnvts/Makefile.in | 8 +- mozilla/network/main/Makefile.in | 2 +- mozilla/network/module/Makefile.in | 4 +- mozilla/network/util/Makefile.in | 9 +- mozilla/nsprpub/lib/msgc/tests/Makefile.in | 4 + mozilla/nsprpub/pr/include/md/Makefile.in | 4 + mozilla/nsprpub/pr/src/md/unix/Makefile.in | 7 + mozilla/privacy/src/Makefile.in | 2 +- 34 files changed, 494 insertions(+), 1091 deletions(-) diff --git a/mozilla/caps/include/Makefile.in b/mozilla/caps/include/Makefile.in index ae15228fa93..b9bb37993ca 100644 --- a/mozilla/caps/include/Makefile.in +++ b/mozilla/caps/include/Makefile.in @@ -23,7 +23,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORTS = nsZip.h nsZig.h nsLoadZig.h nsPrincipal.h nsPrivilege.h nsPrivilegeManager.h nsPrivilegeTable.h nsSystemPrivilegeTable.h nsTarget.h nsUserTarget.h jpermission.h nsUserDialogHelper.h admin.h nsCaps.h nsCapsEnums.h +EXPORTS = nsZip.h nsZig.h nsLoadZig.h nsPrincipal.h nsPrivilege.h nsPrivilegeManager.h nsPrivilegeTable.h nsSystemPrivilegeTable.h nsTarget.h nsUserTarget.h jpermission.h nsUserDialogHelper.h admin.h nsCaps.h nsCapsEnums.h EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in index cf03d53b404..72fc24d4297 100644 --- a/mozilla/caps/src/Makefile.in +++ b/mozilla/caps/src/Makefile.in @@ -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 \ @@ -41,7 +45,7 @@ CSRCS = \ jpermission.c \ nsUserTarget.c \ admin.c \ - nsCaps.c \ + nsCaps.c \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/cmd/Makefile.in b/mozilla/cmd/Makefile.in index a0d400c4fd5..ac76532dc92 100644 --- a/mozilla/cmd/Makefile.in +++ b/mozilla/cmd/Makefile.in @@ -17,11 +17,14 @@ DEPTH = .. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = $(addsuffix fe, $(MOZ_FE)) patcher +include $(topsrcdir)/config/config.mk + +DIRS = $(addsuffix fe, $(MOZ_FE)) patcher include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/cmd/stubfe/Makefile.in b/mozilla/cmd/stubfe/Makefile.in index 180400767d5..2aa5c51e04f 100644 --- a/mozilla/cmd/stubfe/Makefile.in +++ b/mozilla/cmd/stubfe/Makefile.in @@ -15,208 +15,73 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. # -########################################################################## +###################################################################### # -# Makefile for the Mozilla X front end. -# -# There are N dimensions to a full complement of netscape binaries: -# -# - target architecture -# - debug vs optimize -# - normal vs vendor-cobranded version (number, anim, etc) -# - normal vs purified -# -# A directory is needed for each of the first two dimensions (target -# and debug) but executables for all of the others will then be built -# in the same directory from the same .o files. The files have names -# as follows: -# -# netscape-export 2.0 -# netscape-nis-export 2.0 (SunOS 4 only) -# netscape-sgi-export 2.0S (Irix5 only) -# netscape-export.pure 2.0 (SunOS 4 and Solaris only) -# ...etc... -# -# The only difference in the executables is which version of config-*.o -# is linked in, and whether or not -lresolv is used. -# -# The "release" target will create a release/ subdirectory, and N subdirs -# of that in which the various tar files will go. The tar files will be -# uniquely named, though the executables in them are all called "netscape". -# -# The exception to this is that the -nis versions don't get their own tar -# files, they are lumped in with the normal SunOS 4 package with the names -# "netscape" (for the NIS version) and "netscape_dns" (for the -lresolv -# version.) +# Makefile for tubbed-out FE, modeled after XFE Makefile. # DEPTH = ../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = moz -USE_3PANE = 1 -USE_SPELLCHECK = 1 +REQUIRES = \ + addr \ + applet \ + img \ + edtplug \ + jtools \ + lay \ + layer \ + js \ + libfont \ + mariner \ + msg \ + java \ + plds \ + nsprpub \ + parse \ + plug \ + plugimpl \ + hook \ + pref \ + rdf \ + security \ + softupdt \ + libreg \ + style \ + util \ + $(NULL) -REQUIRES = addr \ - applet \ - img \ - edtplug \ - jtools \ - lay \ - layer \ - js \ - libfont \ - mariner \ - msg \ - $(NULL) -ifdef NSPR20 -REQUIRES += plds \ - nspr20 \ - $(NULL) -else -REQUIRES += nspr \ - $(NULL) -endif -REQUIRES += parse \ - plug \ - hook \ - pref \ - rdf \ - security \ - softupdt \ - libreg \ - style \ - util \ - java \ - ldap \ - $(NULL) +CSRCS = \ + main.c \ + stubbm.c \ + stubctxt.c \ + stubdlgs.c \ + stubedit.c \ + stubenc.c \ + stubform.c \ + stubgrid.c \ + stubhelp.c \ + stubimg.c \ + stublay.c \ + stubloc.c \ + stubmail.c \ + stubmisc.c \ + stubplug.c \ + stubps.c \ + stubrdf.c \ + stubrgn.c \ + stubsec.c \ + stubstr.c \ + stubtime.c \ + $(NULL) -CSRCS = \ - main.c \ - stubbm.c \ - stubctxt.c \ - stubdlgs.c \ - stubedit.c \ - stubenc.c \ - stubform.c \ - stubgrid.c \ - stubhelp.c \ - stubimg.c \ - stublay.c \ - stubloc.c \ - stubmail.c \ - stubplug.c \ - stubps.c \ - stubrdf.c \ - stubrgn.c \ - stubsec.c \ - stubstr.c \ - stubtime.c \ - $(NULL) - -ifndef MOZ_LITE -XFE_PROGNAME := mozilla -DSO_PROGNAME := moz -PRODUCT_NAME := Communicator -NETHELP_DIR := comm -else -XFE_PROGNAME := mozilla-lite -DSO_PROGNAME := moz-lite -PRODUCT_NAME := Navigator -NETHELP_DIR := ratbert -CSRCS += rat_stubs.c -endif - -X_RELEASES = release-YYY \ - release-net-YYY \ - release-sgi-YYY \ - $(NULL) - -EXPORT_RELEASES = $(subst YYY,export,$(X_RELEASES)) -FRANCE_RELEASES = $(subst YYY,france,$(X_RELEASES)) -US_RELEASES = $(subst YYY,us,$(X_RELEASES)) - -RELEASES = $(EXPORT_RELEASES) $(FRANCE_RELEASES) $(US_RELEASES) - -GUESS_CONFIG := $(shell $(topsrcdir)/config/config.guess | sed 's/i[23456]86/x86/') - -ifdef BUILD_INTL -README_FILE = $(DEPTH)/l10n/us/xfe/README.intl -else -README_FILE = $(OBJDIR)/README -endif - -BUILD_NUMBER = $(DEPTH)/build/build_number -LICENSE_DIR = $(DEPTH)/l10n/us/xp - -LICENSES = $(LICENSE_DIR)/LICENSE-alpha \ - $(LICENSE_DIR)/LICENSE-export-beta \ - $(LICENSE_DIR)/LICENSE-export \ - $(NULL) - -COMMON_REL_DEPS = versionn.h \ - make-release \ - $(OBJDIR)/LICENSE \ - $(EXTRA_REL_FILES) \ - $(TEST_PLUGIN) \ - $(AUTOADMIN_DSO) \ - $(README_FILE) \ - $(DEPTH)/tpubs/$(NETHELP_DIR)/nethelp.tar.gz \ - $(DIST)/bin/zigbert$(BIN_SUFFIX) - -ifdef USE_SPELLCHECK -COMMON_REL_DEPS += \ - $(DEPTH)/modules/spellchk/data/spellchk.tar.gz \ - $(NULL) -endif - -MOZILLA_ZIP = java/applet \ - java/awt \ - java/awt/image \ - java/awt/peer \ - java/io \ - java/lang \ - java/lang/reflect \ - java/net \ - java/util \ - java/text \ - java/text/resources \ - netscape/context \ - netscape/applet \ - netscape/console \ - netscape/debug \ - netscape/plugin \ - netscape/javascript \ - netscape/util \ - netscape/application \ - netscape/constructor \ - netscape/security \ - netscape/softupdate \ - netscape/net \ - netscape/misc \ - netscape/ldap/ber/stream \ - netscape/ldap/util \ - netscape/ldap/client/opers \ - netscape/ldap/client \ - netscape/ldap \ - sun/io \ - sun/audio \ - sun/awt \ - sun/awt/image \ - sun/awt/motif \ - sun/misc/Cache.class \ - sun/misc/Ref.class \ - META-INF \ - $(NULL) - -ALL_CLASS_DEPS = $(shell find $(XPDIST)/classes -type f \( -name "*.class" -o -name "*.gif" -o -name "*.mf" -o -name "*.sf" -o -name "*.rsa" -o -name "*.properties*" \) -print) - -####################################################################### +###################################################################### include $(topsrcdir)/config/config.mk @@ -224,101 +89,75 @@ CCLD = $(CCC) LDFLAGS = $(CFLAGS) NOMD_LDFLAGS = $(NOMD_CFLAGS) -ifdef MOZILLA_GPROF -CSRCS += gmon.c -LDFLAGS = $(OPTIMIZER) -$(OBJDIR)/gmon.o: gmon.c gmon.h - $(CC) -O -c -o $@ $< -endif - -ifeq ($(OS_ARCH),HP-UX) - -# HP requires C++ programs to have main() in a C++ file. -CPPSRCS = cplusplusmain.cc -CFLAGS += -DCPLUSPLUS_LINKAGE - -ifeq ($(OS_RELEASE),B.10) -HPUX_EXTRA_DIRS = Xmu -endif - -endif - OBJS = $(CSRCS:.c=.o) $(CPPSRCS:.cc=.o) -GARBAGE += $(wildcard java_40*) e_kit_resources.h cxxlink-filter - -ifdef FORTEZZA -CI_LIB = $(DIST)/lib/libci.a -else -CI_LIB = -endif - -SEC_LIBS = $(DIST)/lib/lib$(LITE_PREFIX)secnav.a \ - $(DIST)/lib/libssl.a \ - $(DIST)/lib/libcert.a \ - $(DIST)/lib/libpkcs12.a \ - $(DIST)/lib/libpkcs7.a \ - $(DIST)/lib/libsecmod.a \ - $(DIST)/lib/libkey.a \ - $(DIST)/lib/libcrypto.a \ - $(DIST)/lib/libsecutil.a \ - $(DIST)/lib/libhash.a \ - $(DIST)/lib/libhtmldlgs.a \ - $(NULL) - -ifndef MOZ_LITE -SEC_LIBS += $(DIST)/lib/libldap.a $(DIST)/lib/liblber.a -endif - -SEC_LIBS += $(CI_LIB) - -US_LIB = $(SEC_LIBS) $(DIST)/lib/libdomestic.a -EXPORT_LIB = $(SEC_LIBS) $(DIST)/lib/libexport.a -FRANCE_LIB = $(SEC_LIBS) $(DIST)/lib/libfrance.a - -ifeq ($(OS_ARCH),AIX) -NSPR_LIB = -else -ifdef NSPR20 -NSPR_LIB = $(DIST)/lib/libplds21.a -NSPR_LIB += $(DIST)/lib/libplc21.a -NSPR_LIB += $(DIST)/lib/libmsgc21.a -NSPR_LIB += $(DIST)/lib/libnspr21.a -else -NSPR_LIB = $(DIST)/lib/libnspr.a -endif -endif +NSPR_LIB = $(DIST)/lib/libplds21.a \ + $(DIST)/lib/libplc21.a \ + $(DIST)/lib/libmsgc21.a \ + $(DIST)/lib/libnspr21.a ifdef DBMALLOC NSPR_LIB += $(DIST)/lib/libdbmalloc.a endif -ifndef DISABLE_MARINER CFLAGS += -DENABLE_MARINER -endif + # # We need libnet.a in there twice because libmsg and libnet have circular # dependencies on functions. # -BASIC_LIBS = $(DIST)/lib/lib$(LITE_PREFIX)net.a \ +BASIC_LIBS = \ + $(XFE2_LIB) \ + $(MICROLINE_LIB) \ + $(ICONS_LIB) \ + $(DTWIDGETS_LIB) \ + $(XFE_WIDGETS_BM_LIB) \ + $(XFE_WIDGETS_LIB) \ + $(DIST)/lib/libnetcnvts.a \ + $(DIST)/lib/libnetwork.a \ + $(DIST)/lib/libnetcache.a \ + $(DIST)/lib/libnetutil.a \ + $(DIST)/lib/libcnetinit.a \ + $(DIST)/lib/libabouturl.a \ + $(DIST)/lib/libdataurl.a \ + $(DIST)/lib/libnetcnvts.a \ + $(DIST)/lib/libfileurl.a \ + $(DIST)/lib/libftpurl.a \ + $(DIST)/lib/libgophurl.a \ + $(DIST)/lib/libhttpurl.a \ + $(DIST)/lib/libjsurl.a \ + $(DIST)/lib/libmarimurl.a \ + $(DIST)/lib/libremoturl.a \ + $(DIST)/lib/libnetwork.a \ + $(DIST)/lib/libmimetype.a \ + $(DIST)/lib/lib$(LITE_PREFIX)rdf.a \ + $(DIST)/lib/lib$(LITE_PREFIX)xml.a \ $(DIST)/lib/lib$(LITE_PREFIX)lay.a \ + $(DIST)/lib/libxlate.a \ + $(DIST)/lib/libmariner.a \ $(DIST)/lib/libimg.a \ - $(DIST)/lib/libli.a \ - $(DIST)/lib/libjmc.a \ + $(DIST)/lib/libprivacy.a \ + $(NULL) + +ifdef MOZ_LOC_INDEP +BASIC_LIBS += $(DIST)/lib/libli.a +endif + +ifdef JAVA_OR_NSJVM +JAVA_JMC = $(DIST)/lib/libjmc.a # XXX To be removed... +endif + +BASIC_LIBS += \ + $(JAVA_JMC) \ $(DIST)/lib/libhook.a \ $(DIST)/lib/libparse.a \ $(DIST)/lib/lib$(LITE_PREFIX)pref.a \ $(DIST)/lib/lib$(LITE_PREFIX)i18n.a \ $(DIST)/lib/libpics.a \ $(DIST)/lib/libpwcac.a \ - $(DIST)/lib/libdbm.a - -ifdef MOZ_NATIVE_PNG -BASIC_LIBS += -lpng -else -BASIC_LIBS += $(DIST)/lib/libpng.a -endif + $(DIST)/lib/libreg.a \ + $(NULL) ifdef MOZ_NATIVE_JPEG BASIC_LIBS += -ljpeg @@ -326,93 +165,210 @@ else BASIC_LIBS += $(DIST)/lib/libjpeg.a endif -ifndef MOZ_LITE -BASIC_LIBS += $(DIST)/lib/libmsg.a \ - $(DIST)/lib/libnet.a \ - $(DIST)/lib/libmisc.a \ - $(DIST)/lib/libaddr.a \ - $(DIST)/lib/libneo.a \ - $(DIST)/lib/libmime.a \ - $(NULL) +ifdef MOZ_NATIVE_PNG +BASIC_LIBS += -lpng else -BASIC_LIBS += $(DIST)/lib/lib$(LITE_PREFIX)misc.a +BASIC_LIBS += $(DIST)/lib/libpng.a endif -BASIC_LIBS += $(DIST)/lib/libxlate.a \ - $(DIST)/lib/lib$(LITE_PREFIX)plug.a \ - $(DIST)/lib/libutil.a \ - $(NULL) +BASIC_LIBS_2 = \ + $(DIST)/lib/lib$(LITE_PREFIX)xp.a \ + $(DIST)/lib/libdbm.a \ + $(DIST)/lib/libcaps.a \ + $(DIST)/lib/libxpcom.a \ + $(DIST)/lib/lib$(LITE_PREFIX)rdf.a \ + $(NULL) -ifndef MOZ_LITE -ifdef USE_SPELLCHECK_STATIC -BASIC_LIBS += $(DIST)/lib/libspellchk.a + +# 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 += \ + $(DIST)/lib/libns_mime.a \ + $(NULL) +endif +BASIC_LIBS_2 += \ + $(DIST)/lib/libldap.a \ + $(NULL) + +endif + +BASIC_LIBS += \ + $(DIST)/lib/libmisc.a \ + $(DIST)/lib/libprgrss.a \ + $(NULL) + +ifdef MOZ_LDAP +BASIC_LIBS += \ + $(DIST)/lib/libldap.a \ + $(DIST)/lib/liblber.a \ + $(NULL) +endif + +ifdef MOZ_MAIL_NEWS +BASIC_LIBS += \ + $(DIST)/lib/libmozmsg.a \ + $(NULL) +ifdef MOZ_SECURITY +BASIC_LIBS += $(DIST)/lib/libmsg.a \ + $(NULL) +endif +BASIC_LIBS += $(DIST)/lib/libaddr.a \ + $(DIST)/lib/libneo.a \ + $(DIST)/lib/libaddr.a \ + $(NULL) +endif + +ifdef MOZ_MAIL_NEWS +BASIC_LIBS += $(DIST)/lib/libnntpurl.a \ + $(DIST)/lib/libsmtpurl.a \ + $(DIST)/lib/libimap4url.a \ + $(DIST)/lib/libpop3url.a \ + $(DIST)/lib/libmailbxurl.a \ + $(DIST)/lib/libcrtldurl.a \ + $(NULL) +endif + +ifdef MOZ_MAIL_NEWS +ifdef MOZ_LDAP +BASIC_LIBS += $(DIST)/lib/libldapurl.a \ + $(NULL) endif endif -BASIC_LIBS += $(DIST)/lib/libfont.a \ - $(DIST)/lib/libprgrss.a +ifdef MOZ_CALENDAR +BASIC_LIBS += \ + $(DIST)/lib/libjulian.a \ + $(DIST)/lib/libnscnv30.a \ + $(DIST)/lib/libnsuni30.a \ + $(DIST)/lib/libnsfmt30.a \ + $(NULL) +endif + +BASIC_LIBS += \ + $(DIST)/lib/lib$(LITE_PREFIX)plug.a \ + $(DIST)/lib/libutil.a \ + $(DIST)/lib/libfont.a \ + $(NULL) ifndef NO_LAYERS BASIC_LIBS += $(DIST)/lib/liblayer.a endif -ifndef NO_JAVA +######################################################################## +# Java +# +ifdef MOZ_JAVA +# +# Monolithic Java +# -BASIC_LIBS += $(DIST)/lib/lib$(LITE_PREFIX)applet.a \ +BASIC_LIBS += \ + $(DIST)/lib/lib$(LITE_PREFIX)applet.a \ $(DIST)/lib/libjrt.a \ $(DIST)/lib/libjmd.a \ $(NULL) -ifndef MOZ_LITE +ifdef EDITOR BASIC_LIBS += $(DIST)/lib/libedtplug.a endif -BASIC_LIBS += $(DIST)/lib/libnsn.a \ - $(DIST)/lib/libjsl.a \ +BASIC_LIBS += \ + $(DIST)/lib/libnsn.a \ $(DIST)/lib/libnsc.a \ $(DIST)/lib/libjpw.a \ $(DIST)/lib/libzpw.a \ - $(DIST)/lib/libreg.a \ + $(DIST)/lib/libiawt.a \ $(DIST)/lib/libmmedia.a \ $(DIST)/lib/libsoftupdate.a \ + $(DIST)/lib/libprgrss.a \ $(DIST)/lib/libcon.a \ $(DIST)/lib/libjbn.a \ - $(DIST)/lib/lib$(LITE_PREFIX)xp.a \ - $(DIST)/lib/librdf.a \ - $(DIST)/lib/libmariner.a \ $(NULL) -ifdef MOZ_NATIVE_ZLIB -BASIC_LIBS += -lz \ - $(NULL) -else -BASIC_LIBS += $(DIST)/lib/libzlib.a \ - $(NULL) +ifdef MOZ_SECURITY +BASIC_LIBS += $(DIST)/lib/libjsl.a endif + +ifdef MOZ_MAIL_NEWS +BASIC_LIBS += $(DIST)/lib/libjsl.a +endif + +BASIC_LIBS += $(DIST)/lib/libjrt.a + +else # !MOZ_JAVA + +# +# OJI +# + +ifdef MOZ_OJI + +BASIC_LIBS += $(DIST)/lib/liboji.a + +ifdef NSJVM + +ifdef EDITOR +BASIC_LIBS += $(DIST)/lib/libedtplug.a +endif +BASIC_LIBS += $(DIST)/lib/libsoftupdate.a +else # !NSJVM +BASIC_LIBS += \ + $(DIST)/lib/libstubsj.a \ + $(DIST)/lib/libstubnj.a \ + $(NULL) +endif # !NSJVM + +BASIC_LIBS += $(DIST)/lib/libprgrss.a \ + $(NULL) + +else # !MOZ_OJI +# No Monolithic Java, no OJI, just stubs. + +BASIC_LIBS += \ + $(DIST)/lib/libstubsj.a \ + $(DIST)/lib/libstubnj.a \ + $(NULL) + +endif # !MOZ_OJI +endif # !MOZ_JAVA + +ifdef MOZ_NATIVE_ZLIB +BASIC_LIBS += -lz +BASIC_DSOS += -lz +else +# XXX To a DSO... +BASIC_LIBS += $(DIST)/lib/libzlib.a +BASIC_DSOS += -lzlib endif ifndef NO_MOCHA -BASIC_LIBS += $(DIST)/lib/libjs.a $(DIST)/lib/libjsj.a $(DIST)/lib/libmocha.a $(DIST)/lib/libimg.a \ - $(DIST)/lib/lib$(LITE_PREFIX)lay.a +# XXX To a DSO... +BASIC_LIBS += $(DIST)/lib/libjs.a $(DIST)/lib/libjsj.a +BASIC_DSOS += -ljs -ljsj +BASIC_LIBS += $(DIST)/lib/libmocha.a endif # Post-Java libs -BASIC_LIBS += $(DIST)/lib/libstyle.a $(DIST)/lib/libjar.a +BASIC_LIBS += $(DIST)/lib/libstyle.a $(DIST)/lib/libreg.a -ifndef NO_UNIX_LDAP -BASIC_LIBS += $(DIST)/lib/libldap.a $(DIST)/lib/liblber.a + +ifdef MOZ_SECURITY +BASIC_LIBS += $(DIST)/lib/libjar.a +else +EXPORT_LIB = $(DIST)/lib/libhtmldlgs.a $(DIST)/lib/libsecfree.a endif -LOCALES = $(LOCALE_MAP) $(MAIL_IM_HACK) $(NEWS_IM_HACK) - -ALL_US_LIBS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) -ALL_EXPORT_LIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) -ALL_FRANCE_LIBS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) - -ALL_US_DSOS = $(ALL_US_LIBS:$(DIST)/lib/lib%.a=-l%) -ALL_EXPORT_DSOS = $(ALL_EXPORT_LIBS:$(DIST)/lib/lib%.a=-l%) -ALL_FRANCE_DSOS = $(ALL_FRANCE_LIBS:$(DIST)/lib/lib%.a=-l%) PLUGIN_DSO = $(DIST)/bin/libnullplugin.so WEBFONT_DSO = $(DIST)/bin/libTrueDoc.so @@ -421,56 +377,9 @@ ifndef MOZ_LITE JSD_DSO = $(DIST)/bin/libjsd.$(DLL_SUFFIX) endif -ifdef BUILD_UNIX_PLUGINS -ifdef BUILD_OFFICIAL -EXTRA_REL_FILES += $(PLUGIN_DSO) -ifdef MKSHLIB -EXTRA_REL_FILES += $(JSD_DSO) -endif -AUTOADMIN_DSO = $(DIST)/bin/libAutoAdmin.so -endif -TEST_PLUGIN = $(DIST)/bin/libtextplugin.so -endif +TARGETS += $(OBJDIR)/stubfe -# -# Only build the export binary by default, so the Security folks -# will be happy. Release builds will build all three binaries. -# -# Defining NO_BUILD_EXPORT will _disable_ export builds, and -# defining BUILD_FRANCE and BUILD_US will enable france and us -# builds, respectively. These can be set in the environment, -# on the command-line, or in myconfig.mk. -# -ifdef BUILD_OFFICIAL -BUILD_FRANCE = 1 -BUILD_US = 1 -endif - -ifdef MKSHLIB -ifndef NO_NETSCAPE_SHARED -ifndef NO_BUILD_EXPORT -TARGETS += $(OBJDIR)/$(DSO_PROGNAME)-export -endif -ifdef BUILD_FRANCE -TARGETS += $(OBJDIR)/$(DSO_PROGNAME)-france -endif -ifdef BUILD_US -TARGETS += $(OBJDIR)/$(DSO_PROGNAME)-us -endif -endif -endif - -ifndef NO_NETSCAPE_STATIC -ifndef NO_BUILD_EXPORT -TARGETS += $(OBJDIR)/$(XFE_PROGNAME)-export -endif -ifdef BUILD_FRANCE -TARGETS += $(OBJDIR)/$(XFE_PROGNAME)-france -endif -ifdef BUILD_US -TARGETS += $(OBJDIR)/$(XFE_PROGNAME)-us -endif -endif +ALL_TARGETS = $(TARGETS) ####################################################################### @@ -485,15 +394,7 @@ DEFINES += -DNEW_DECODERS # ifdef BUILD_OFFICIAL -EXTRA_REL_FILES += $(DIST)/bin/vreg $(DEPTH)/l10n/us/xp/bookmark.htm -endif - -ifndef BUILD_OFFICIAL -# -# Developers won't need libTrueDoc.so. No point having a dependency -# on this when only official builds (release builds) need this. -# -NO_WEBFONTS = 1 +EXTRA_REL_FILES += $(DIST)/bin/vreg $(srcdir)/l10n/us/xp/bookmark.htm endif # Only SunOS4 needs two versions NIS and DNS. @@ -517,15 +418,8 @@ EXTRA_POST_LINK_CMD = echo EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIB) EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) -FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIB) -FRANCE_DEPLIBS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) - -US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIB) -US_DEPLIBS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) DSO_EX_LIBS = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%) -DSO_EX_LIBS = $(FRANCE_LDFLAGS:$(DIST)/lib/lib%.a=-l%) -DSO_US_LIBS = $(US_LDFLAGS:$(DIST)/lib/lib%.a=-l%) ####################################################################### # @@ -632,7 +526,7 @@ CCLD = CC ifdef USE_GTSCC ifndef NO_GTSCC CCLD = $(DIST)/bin/gtscc $(GTSCC_LD_OPTIONS) -gtsfile $(DEPTH)/config/$(OBJDIR)/db.gts -gtsrootdir $(DEPTH) -TARGETS = $(OBJDIR)/$(XFE_PROGNAME)-export +TARGETS = $(OBJDIR)/stubfe endif endif @@ -732,14 +626,6 @@ ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_RELEASE),4.1) -ALL_TARGETS += $(OBJDIR)/$(XFE_PROGNAME)-nis-export \ - $(OBJDIR)/$(XFE_PROGNAME)-nis-net-export \ - $(OBJDIR)/$(XFE_PROGNAME)-nis-france \ - $(OBJDIR)/$(XFE_PROGNAME)-nis-net-france \ - $(OBJDIR)/$(XFE_PROGNAME)-nis-us \ - $(OBJDIR)/$(XFE_PROGNAME)-nis-net-us \ - $(NULL) - OTHER_LIBS = ifndef NO_WEBFONTS @@ -801,6 +687,8 @@ OTHER_LIBS = $(OS_LIBS) -lm LDFLAGS = $(NOMD_CFLAGS) endif +OTHER_LIBS += -L/usr/dt/lib -lXm + US_LDFLAGS = -z defs -L$(USRLIBDIR) \ -R$(USRLIBDIR) $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) \ $(OTHER_LIBS) $(NSPR_LIB) @@ -842,476 +730,22 @@ $(TARGETS): $(OBJS) # -####################################################################### -# Rules to build config*.o files - -#- export - -$(OBJDIR)/$(LITE_PREFIX)config-export.o: config.c versionn.h Makefile $(OBJS) $(EXPORT_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN} \ - -UHAVE_NIS -UFRANCE_VERSION -DEXPORT_VERSION -UUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/config-net-export.o: config.c versionn.h Makefile $(OBJS) $(EXPORT_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN}N \ - -UHAVE_NIS -UFRANCE_VERSION -DEXPORT_VERSION -UUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/$(LITE_PREFIX)config-nis-export.o: config.c versionn.h Makefile $(OBJS) $(NIS_OBJS) $(EXPORT_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN} \ - -DHAVE_NIS -UFRANCE_VERSION -DEXPORT_VERSION -UUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/config-nis-net-export.o: config.c versionn.h Makefile $(OBJS) $(NIS_OBJS) $(EXPORT_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN}N \ - -DHAVE_NIS -UFRANCE_VERSION -DEXPORT_VERSION -UUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/config-sgi-export.o: config.c versionn.h Makefile $(OBJS) $(EXPORT_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN}S \ - -UHAVE_NIS -UFRANCE_VERSION -DEXPORT_VERSION -UUS_VERSION -DVENDOR_ANIM - -#- france - -$(OBJDIR)/$(LITE_PREFIX)config-france.o: config.c versionn.h Makefile $(OBJS) $(FRANCE_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN} \ - -UHAVE_NIS -DFRANCE_VERSION -UEXPORT_VERSION -UUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/config-net-france.o: config.c versionn.h Makefile $(OBJS) $(FRANCE_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN}N \ - -UHAVE_NIS -DFRANCE_VERSION -UEXPORT_VERSION -UUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/$(LITE_PREFIX)config-nis-france.o: config.c versionn.h Makefile $(OBJS) $(NIS_OBJS) $(FRANCE_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN} \ - -DHAVE_NIS -DFRANCE_VERSION -UEXPORT_VERSION -UUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/config-nis-net-france.o: config.c versionn.h Makefile $(OBJS) $(NIS_OBJS) $(FRANCE_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN}N \ - -DHAVE_NIS -DFRANCE_VERSION -UEXPORT_VERSION -UUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/config-sgi-france.o: config.c versionn.h Makefile $(OBJS) $(FRANCE_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN}S \ - -UHAVE_NIS -DFRANCE_VERSION -UEXPORT_VERSION -UUS_VERSION -DVENDOR_ANIM - -#- us - -$(OBJDIR)/$(LITE_PREFIX)config-us.o: config.c versionn.h Makefile $(OBJS) $(US_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN} \ - -UHAVE_NIS -UFRANCE_VERSION -UEXPORT_VERSION -DUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/config-net-us.o: config.c versionn.h Makefile $(OBJS) $(US_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN}N \ - -UHAVE_NIS -UFRANCE_VERSION -UEXPORT_VERSION -DUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/$(LITE_PREFIX)config-nis-us.o: config.c versionn.h Makefile $(OBJS) $(NIS_OBJS) $(US_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN} \ - -DHAVE_NIS -UFRANCE_VERSION -UEXPORT_VERSION -DUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/config-nis-net-us.o: config.c versionn.h Makefile $(OBJS) $(NIS_OBJS) $(US_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN}N \ - -DHAVE_NIS -UFRANCE_VERSION -UEXPORT_VERSION -DUS_VERSION -UVENDOR_ANIM - -$(OBJDIR)/config-sgi-us.o: config.c versionn.h Makefile $(OBJS) $(US_DEPLIBS) - @echo Generating $@ from config.c...; \ - X=' '; \ - VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' versionn.h` ; \ - $(CC) -c $(CFLAGS) -o $@ config.c \ - -DCONFIG="$(GUESS_CONFIG)" \ - -DDATE="`date +%d-%h-%y`" \ - -DVERSION=$${VN}S \ - -UHAVE_NIS -UFRANCE_VERSION -UEXPORT_VERSION -DUS_VERSION -DVENDOR_ANIM - -####################################################################### -# Rules to build license.o files - -$(OBJDIR)/license.o: $(OBJDIR)/LICENSE.c Makefile - $(CC) -c -o $@ $< - -$(OBJDIR)/LICENSE.c: Makefile $(LICENSES) make-license - @./make-license $@ $(LICENSE_DIR) "" export - -$(OBJDIR)/LICENSE: $(OBJDIR)/license.o make-license - @./make-license $@ $(LICENSE_DIR) "" export - -####################################################################### -# Rules to build README files ( release specific ) - -$(OBJDIR)/README: README.tmpl versionn.h - @rm -f $@ - @echo "Generating $@ from $<..."; \ - CLASS="Netscape"; \ - NAME="Netscape"; \ - PROGNAME="netscape"; \ - PRODUCT="$(PRODUCT_NAME)"; \ - VN=`sed -n 's/^#define VERSION_NUMBER *\(.*\)$$/\1/p' versionn.h`; \ - VERS=`echo $$VN$$vsuffix`; \ - sed "s/@NAME@/$$NAME/g; \ - s/@CLASS@/$$CLASS/g; \ - s/@PROGNAME@/$$PROGNAME/g; \ - s/@PRODUCT@/$$PRODUCT/g; \ - s/@VERSION@/$$VERS/g; \ - s/@URLVERSION@/$$VERS/g" $< > $@ ####################################################################### # Rules to build resources .SUFFIXES: .ad -# DO NOT CHANGE THE ORDER OF THE DEPENDENCIES. Add new ones to the end. -resources-%.o: RESOURCES-%.c Makefile - $(CC) -c $(HPUX_RESOURCE_HACK) -o $@ $< +stubfe: $(OBJDIR)/stubfe -RESOURCES-%.c: Netscape-%.ad ad2c Makefile - @echo 'char *fe_fallbackResources[] = {' > $@; \ - ./ad2c $< >> $@; \ - echo '0};' >> $@ - -# Explicit dependency list to ensure that e_kit_resources.h gets built. -$(OBJDIR)/e_kit.o: e_kit.c e_kit_resources.h - -# Turn ekit app-defaults into a C file -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/; \ - s/ /\\/g;s/\(.*\)/ "\1"/;s/^ *"\\"$$//' >> $@ - @echo ';' >> $@ - -#- export - -$(OBJDIR)/Netscape-nis-export.ad $(OBJDIR)/Netscape-export.ad: Makefile resources versionn.h strs make-resources $(LOCALE_MAP) - @./make-resources $@ Netscape Netscape "" export $(LOCALES) - -$(OBJDIR)/Netscape-nis-net-export.ad $(OBJDIR)/Netscape-net-export.ad: Makefile resources versionn.h strs make-resources $(LOCALE_MAP) - @./make-resources $@ Netscape Netscape "N" export $(LOCALES) - -$(OBJDIR)/Netscape-sgi-export.ad: Makefile resources versionn.h strs make-resources $(LOCALE_MAP) - @./make-resources $@ Netscape Netscape "S" export $(LOCALES) - -#- france - -$(OBJDIR)/Netscape-nis-france.ad $(OBJDIR)/Netscape-france.ad: Makefile resources versionn.h strs make-resources $(LOCALE_MAP) - @./make-resources $@ Netscape Netscape "" france $(LOCALES) - -$(OBJDIR)/Netscape-nis-net-france.ad $(OBJDIR)/Netscape-net-france.ad: Makefile resources versionn.h strs make-resources $(LOCALE_MAP) - @./make-resources $@ Netscape Netscape "N" france $(LOCALES) - -$(OBJDIR)/Netscape-sgi-france.ad: Makefile resources versionn.h strs make-resources $(LOCALE_MAP) - @./make-resources $@ Netscape Netscape "S" france $(LOCALES) - -#- us - -$(OBJDIR)/Netscape-nis-us.ad $(OBJDIR)/Netscape-us.ad: Makefile resources versionn.h strs make-resources $(LOCALE_MAP) - @./make-resources $@ Netscape Netscape "" us $(LOCALES) - -$(OBJDIR)/Netscape-nis-net-us.ad $(OBJDIR)/Netscape-net-us.ad: Makefile resources versionn.h strs make-resources $(LOCALE_MAP) - @./make-resources $@ Netscape Netscape "N" us $(LOCALES) - -$(OBJDIR)/Netscape-sgi-us.ad: Makefile resources versionn.h strs make-resources $(LOCALE_MAP) - @./make-resources $@ Netscape Netscape "S" us $(LOCALES) - -####################################################################### -# The "-export" DSO targets follow - -$(OBJDIR)/$(DSO_PROGNAME)-export: $(OBJS) $(EXPORT_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(EXPORT_OBJS) -L$(DIST)/bin -L$(DIST)/lib $(DSO_EX_LIBS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(DSO_PROGNAME)-export.mcv: $(OBJS) $(EXPORT_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(CFLAGS) $(OBJS) $(EXPORT_OBJS) -L$(DIST)/bin -L$(DIST)/lib $(DSO_EX_LIBS) $(DNS_LIB) -lmalloc_cv - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(DSO_PROGNAME)-export.pure: $(OBJS) $(EXPORT_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(PURIFY) $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(EXPORT_OBJS) -L$(DIST)/bin -L$(DIST)/lib $(DSO_EX_LIBS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(DSO_PROGNAME)-export.quantify: $(OBJS) $(EXPORT_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(QUANTIFY) $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(EXPORT_OBJS) -L$(DIST)/bin -L$(DIST)/lib $(DSO_EX_LIBS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -#------------------ the "-us" DSO link targets follow ------------------- # - -$(OBJDIR)/$(DSO_PROGNAME)-us: $(OBJS) $(US_OBJS) $(US_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(US_OBJS) -L$(DIST)/bin -L$(DIST)/lib $(DSO_US_LIBS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(DSO_PROGNAME)-us.pure: $(OBJS) $(US_OBJS) $(US_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(PURIFY) $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(US_OBJS) -L$(DIST)/bin -L$(DIST)/lib $(DSO_US_LIBS) $(DNS_LIB) @$(EXTRA_POST_LINK_CMD) $@ - -#------------------ the "-export" XFE link targets follow ------------------- # - -$(OBJDIR)/$(XFE_PROGNAME)-export: $(OBJS) $(EXPORT_OBJS) $(EXPORT_DEPLIBS) +$(OBJDIR)/stubfe: $(OBJS) $(EXPORT_OBJS) $(EXPORT_DEPLIBS) @$(MAKE_OBJDIR) rm -f $@ $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(EXPORT_OBJS) $(EXPORT_LDFLAGS) $(DNS_LIB) @$(EXTRA_POST_LINK_CMD) $@ -$(OBJDIR)/$(XFE_PROGNAME)-export.pure: $(OBJS) $(EXPORT_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(PURIFY) $(CCLD) -o $@ $(NOMD_LDFLAGS) $(OBJS) $(EXPORT_OBJS) $(EXPORT_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ -$(OBJDIR)/$(XFE_PROGNAME)-export.quantify: $(OBJS) $(EXPORT_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(QUANTIFY) $(CCLD) -o $@ $(NOMD_LDFLAGS) $(OBJS) $(EXPORT_OBJS) $(EXPORT_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(XFE_PROGNAME)-export.prof: $(OBJS) $(EXPORT_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -p -o $@ $(LDFLAGS) $(OBJS) $(EXPORT_OBJS) $(EXPORT_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -#------------------ the "-france" XFE targets follow ---------------- # - -ifndef USE_WACKER - -$(OBJDIR)/$(XFE_PROGNAME)-france: $(OBJS) $(FRANCE_OBJS) $(FRANCE_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(FRANCE_OBJS) $(FRANCE_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -else - -$(OBJDIR)/$(XFE_PROGNAME)-france: $(OBJDIR)/$(XFE_PROGNAME)-export $(XPDIST)/xpdist/france.txt $(DIST)/bin/patcher - @$(MAKE_OBJDIR) - rm -f $@ - $(DIST)/bin/patcher $(XPDIST)/xpdist/france.txt $(OBJDIR)/$(XFE_PROGNAME)-export $@ - -endif - -#------------------ the "-us" link XFE targets follow ------------------- # - -$(OBJDIR)/$(XFE_PROGNAME)-us: $(OBJS) $(US_OBJS) $(US_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(US_OBJS) $(US_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(XFE_PROGNAME)-us-ld: $(OBJS) $(US_OBJS) $(US_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(LD) -o $@ $(OBJS) $(US_OBJS) $(US_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(XFE_PROGNAME)-us.pure: $(OBJS) $(US_OBJS) $(US_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(PURIFY) $(CCLD) -o $@ $(NOMD_LDFLAGS) $(OBJS) $(US_OBJS) $(US_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -#------------------ the "-net" XFE link targets follow ------------------- # - - -$(OBJDIR)/$(XFE_PROGNAME)-net-export: $(OBJS) $(NET_EXPORT_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(NET_EXPORT_OBJS) $(EXPORT_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(XFE_PROGNAME)-net-us: $(OBJS) $(NET_US_OBJS) $(US_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(NET_US_OBJS) $(US_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -ifndef USE_WACKER - -$(OBJDIR)/$(XFE_PROGNAME)-net-france: $(OBJS) $(NET_FRANCE_OBJS) $(FRANCE_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(NET_FRANCE_OBJS) $(FRANCE_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -else - -$(OBJDIR)/$(XFE_PROGNAME)-net-france: $(OBJDIR)/$(XFE_PROGNAME)-net-export $(XPDIST)/xpdist/france.txt $(DIST)/bin/patcher - @$(MAKE_OBJDIR) - rm -f $@ - $(DIST)/bin/patcher $(XPDIST)/xpdist/france.txt $(OBJDIR)/$(XFE_PROGNAME)-net-export $@ - -endif - -#------------------ the "-nis" XFE link targets follow ------------------- # - -$(OBJDIR)/$(XFE_PROGNAME)-nis-export: $(OBJS) $(NIS_EXPORT_OBJS) $(NIS_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(NIS_EXPORT_OBJS) $(EXPORT_LDFLAGS) $(NIS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(XFE_PROGNAME)-nis-france: $(OBJS) $(NIS_FRANCE_OBJS) $(NIS_OBJS) $(FRANCE_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(NIS_FRANCE_OBJS) $(EXPORT_LDFLAGS) $(NIS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(XFE_PROGNAME)-nis-us: $(OBJS) $(NIS_US_OBJS) $(NIS_OBJS) $(US_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(NIS_US_OBJS) $(US_LDFLAGS) $(NIS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(XFE_PROGNAME)-nis-net-export: $(OBJS) $(NIS_EXPORT_OBJS) $(NIS_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(NIS_EXPORT_OBJS) $(EXPORT_LDFLAGS) $(NIS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -#------------------ the "-nis-net" XFE link targets follow ---------------- # - -$(OBJDIR)/$(XFE_PROGNAME)-nis-net-us: $(OBJS) $(NIS_US_OBJS) $(NIS_OBJS) $(US_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(NIS_US_OBJS) $(US_LDFLAGS) $(NIS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -#-------------- SGI versions of the navigator (no nis, no net) ------------# - -$(OBJDIR)/$(XFE_PROGNAME)-sgi-export: $(OBJS) $(SGI_EXPORT_OBJS) $(EXPORT_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(SGI_EXPORT_OBJS) $(EXPORT_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -$(OBJDIR)/$(XFE_PROGNAME)-sgi-us: $(OBJS) $(SGI_US_OBJS) $(US_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(SGI_US_OBJS) $(US_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -ifndef USE_WACKER - -$(OBJDIR)/$(XFE_PROGNAME)-sgi-france: $(OBJS) $(SGI_FRANCE_OBJS) $(FRANCE_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - $(CCLD) -o $@ $(LDFLAGS) $(OBJS) $(SGI_FRANCE_OBJS) $(FRANCE_LDFLAGS) $(DNS_LIB) - @$(EXTRA_POST_LINK_CMD) $@ - -else - -$(OBJDIR)/$(XFE_PROGNAME)-sgi-france: $(OBJDIR)/$(XFE_PROGNAME)-sgi-export $(XPDIST)/xpdist/france.txt $(DIST)/bin/patcher - @$(MAKE_OBJDIR) - rm -f $@ - $(DIST)/bin/patcher $(XPDIST)/xpdist/france.txt $(OBJDIR)/$(XFE_PROGNAME)-sgi-export $@ - -endif - -#---------------- Misc link targets follow ----------------------# - -# Make a dynamic export executable using malloc_cv by default. -mcv: $(OBJDIR)/$(DSO_PROGNAME)-export $(OBJDIR)/$(DSO_PROGNAME)-export.mcv - -# Make a purified, static export executable by default. -pure: $(OBJDIR)/$(XFE_PROGNAME)-export $(OBJDIR)/$(XFE_PROGNAME)-export.pure - -# Trying out quantify. -quantify: $(OBJDIR)/$(XFE_PROGNAME)-export $(OBJDIR)/$(XFE_PROGNAME)-export.quantify - -# Use gtscc to find dead code globals. -unreferenced: $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIB) $(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_LIB) | awk -n '/ 0 0 / { print $$5 " " $$1 }' | sort > $@ - -# Some dependencies that -MDupdate isn't getting. -$(OBJDIR)/strids.o: xfe_err.h -$(OBJDIR)/strings.o: xfe_err.h +install:: $(TARGETS) ifeq ($(OS_ARCH),AIX) AIX_HACK := $(notdir $(AIX_NSPR)) @@ -1321,110 +755,8 @@ $(AIX_HACK): $(AIX_NSPR) $(INSTALL) -m 644 $< . endif -install:: $(AIX_HACK) $(EXTRA_REL_FILES) $(TARGETS) -ifdef TARGETS - $(INSTALL) $(TARGETS) $(DIST)/bin -endif - -####################################################################### -# Release target - -ifdef AUTOADMIN_DSO -$(AUTOADMIN_DSO): - @cd $(DEPTH)/modules/libpref/admin; $(MAKE) POLARIS=1 polaris -endif - -$(PLUGIN_DSO): - @cd plugins/nullplugin; $(MAKE) - -ifdef TEST_PLUGIN -$(TEST_PLUGIN): - @cd plugins/textplugin; $(MAKE) -endif - -$(DIST)/bin/zigbert$(BIN_SUFFIX): - @cd $(DEPTH)/security/cmd/lib; $(MAKE) - @cd $(DEPTH)/security/cmd/jar; $(MAKE) - -$(DEPTH)/tpubs/$(NETHELP_DIR)/nethelp.tar.gz: - @cd $(DEPTH)/tpubs/$(NETHELP_DIR); $(MAKE) release - -ifdef USE_SPELLCHECK -$(DEPTH)/modules/spellchk/data/spellchk.tar.gz: - @cd $(DEPTH)/modules/spellchk/data; $(MAKE) release -endif - -release:: $(RELEASES) - -release-us: $(XFE_PROGNAME)-us $(EXTRA_US_OBJS) $(COMMON_REL_DEPS) - ./make-release $(OBJDIR) $(XFE_PROGNAME) Netscape "" us $(GUESS_CONFIG) $(NEED_YP_VERSION) "$(MCS_CMD)" $(NEED_NLS) "$(EXTRA_US_BINARY) $(EXTRA_REL_FILES)" $(README_FILE) - -release-export: $(XFE_PROGNAME)-export $(EXTRA_EXPORT_OBJS) $(COMMON_REL_DEPS) - ./make-release $(OBJDIR) $(XFE_PROGNAME) Netscape "" export $(GUESS_CONFIG) $(NEED_YP_VERSION) "$(MCS_CMD)" $(NEED_NLS) "$(EXTRA_EXPORT_BINARY) $(EXTRA_REL_FILES)" $(README_FILE) - -release-france: $(XFE_PROGNAME)-france $(EXTRA_FRANCE_OBJS) $(COMMON_REL_DEPS) - ./make-release $(OBJDIR) $(XFE_PROGNAME) Netscape "" france $(GUESS_CONFIG) $(NEED_YP_VERSION) "$(MCS_CMD)" $(NEED_NLS) "$(EXTRA_FRANCE_BINARY) $(EXTRA_REL_FILES)" $(README_FILE) - -#---------------- release-net targets follow --------------------# - -release-net-us: $(XFE_PROGNAME)-net-us $(COMMON_REL_DEPS) - ./make-release $(OBJDIR) $(XFE_PROGNAME) Netscape "N" net-us $(GUESS_CONFIG) $(NEED_YP_VERSION) "$(MCS_CMD)" $(NEED_NLS) "$(EXTRA_REL_FILES)" $(README_FILE) - -release-net-export: $(XFE_PROGNAME)-net-export $(EXTRA_NETEXPORT_OBJS) $(COMMON_REL_DEPS) - ./make-release $(OBJDIR) $(XFE_PROGNAME) Netscape "N" net-export $(GUESS_CONFIG) $(NEED_YP_VERSION) "$(MCS_CMD)" $(NEED_NLS) "$(EXTRA_REL_FILES)" $(README_FILE) - -release-net-france: $(XFE_PROGNAME)-net-france $(EXTRA_NETEXPORT_OBJS) $(COMMON_REL_DEPS) - ./make-release $(OBJDIR) $(XFE_PROGNAME) Netscape "N" net-france $(GUESS_CONFIG) $(NEED_YP_VERSION) "$(MCS_CMD)" $(NEED_NLS) "$(EXTRA_REL_FILES)" $(README_FILE) - -#---------------- release-sgi targets follow --------------------# - -release-sgi-us: $(XFE_PROGNAME)-sgi-us $(COMMON_REL_DEPS) - ./make-release $(OBJDIR) $(XFE_PROGNAME) Netscape "S" sgi-us $(GUESS_CONFIG) $(NEED_YP_VERSION) "$(MCS_CMD)" $(NEED_NLS) $(EXTRA_REL_FILES) $(README_FILE) - -release-sgi-export: $(XFE_PROGNAME)-sgi-export $(COMMON_REL_DEPS) - ./make-release $(OBJDIR) $(XFE_PROGNAME) Netscape "S" sgi-export $(GUESS_CONFIG) $(NEED_YP_VERSION) "$(MCS_CMD)" $(NEED_NLS) "$(EXTRA_REL_FILES)" $(README_FILE) - -release-sgi-france: $(XFE_PROGNAME)-sgi-france $(COMMON_REL_DEPS) - ./make-release $(OBJDIR) $(XFE_PROGNAME) Netscape "S" sgi-france $(GUESS_CONFIG) $(NEED_YP_VERSION) "$(MCS_CMD)" $(NEED_NLS) "$(EXTRA_REL_FILES)" $(README_FILE) - -####################################################################### -# Java Jar File -# -# The definative shipping JAR files are now made in the win32 build -# this is just for developers - -zips: $(JAR_NAME) - -$(XPDIST)/classes/$(JAR_NAME): $(BUILD_NUMBER) Makefile $(ALL_CLASS_DEPS) - @rm -rf $@ - @echo "Building `basename $@`" - cd $(XPDIST)/classes; \ - if test ! -d META-INF; then mkdir META-INF; fi; \ - for d in $(MOZILLA_ZIP); do \ - files=`find $$d \( -name '*.class' -o -name '*.gif' -o -name '*.props' -o -name '*.mf' -o -name '*.sf' -o -name '*.rsa' -o -name '*.properties*' \) -print`; \ - if test -n $${files:-''}; then $(ZIP) $@ $$files ; fi; \ - done; \ - -$(JAR_NAME): $(XPDIST)/classes/$(JAR_NAME) - -# -# symbols.gts for Irix, used by gtscc driver. The file needs to -# be stored in ns/config/symbols.gts. There should be a version -# checked in there. Use this rule only if you get link errors for -# C++ members functions which you reference globally. -# This rule is designed to work on IRIX or Solaris. If it works -# elsewhere fine, but... djw Feb/14/97 -# -$(OBJDIR)/symbols.gts: $(OBJS) $(US_OBJS) $(US_DEPLIBS) - @$(MAKE_OBJDIR) - rm -f $@ - nm -p $(OBJS) $(US_OBJS) $(US_DEPLIBS) > $(OBJDIR)/gts_a - sed -n 's%.* T \(.*\)%\1%p' $(OBJDIR)/gts_a | sort -u > $(OBJDIR)/gts_d - sed -n 's%.* U \(.*\)%\1%p' $(OBJDIR)/gts_a | sort -u > $(OBJDIR)/gts_u - comm -23 $(OBJDIR)/gts_d $(OBJDIR)/gts_u > $@ - rm -f $(OBJDIR)/gts_d $(OBJDIR)/gts_u $(OBJDIR)/gts_a - -symbols.gts: $(OBJDIR)/symbols.gts +# Skip java50.jar creation +java50.jar: export:: $(JAR_NAME) @@ -1433,6 +765,7 @@ $(VERSION_OBJS): versionn.h everything: all $(ALL_TARGETS) symbols: - @echo "ALL_TARGETS = $(ALL_TARGETS)" + @echo "TARGETS = $(TARGETS)" @echo "RELEASES = $(RELEASES)" @echo "OS_ARCH = $(OS_ARCH)" + @echo "OTHER_LIBS = $(OTHER_LIBS) diff --git a/mozilla/cmd/xfe/Makefile.in b/mozilla/cmd/xfe/Makefile.in index ef04a9730e9..4c7173e706f 100644 --- a/mozilla/cmd/xfe/Makefile.in +++ b/mozilla/cmd/xfe/Makefile.in @@ -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,10 +1000,16 @@ 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) +OTHER_LIBS = $(FE_X_LIBS) $(ACLFLAGS) $(ACLIBS) OTHER_DYN_MOTIF_LIBS = $(FE_X_LIBS) $(ACLFLAGS) $(ACLIBS) endif @@ -1026,7 +1050,7 @@ endif # Rules to build config*.o files $(OBJDIR)/$(LITE_PREFIX)config-export.o: config.c versionn.h Makefile $(OBJS) $(EXPORT_DEPLIBS) - @echo Generating $@ from $(srcdir)/config.c...; \ + @echo Generating $@ from $(srcdir)/config.c...; \ X=' '; \ VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' $(srcdir)/versionn.h` ; \ $(CC) -c $(CFLAGS) -o $@ $(srcdir)/config.c \ @@ -1036,7 +1060,7 @@ $(OBJDIR)/$(LITE_PREFIX)config-export.o: config.c versionn.h Makefile $(OBJS) $( -UHAVE_NIS -UFRANCE_VERSION -DEXPORT_VERSION -UUS_VERSION -UVENDOR_ANIM $(OBJDIR)/$(LITE_PREFIX)config-nis-export.o: config.c versionn.h Makefile $(OBJS) $(NIS_OBJS) $(EXPORT_DEPLIBS) - @echo Generating $@ from $(srcdir)/config.c...; \ + @echo Generating $@ from $(srcdir)/config.c...; \ X=' '; \ VN=`sed -n$$X 's/^#define VERSION_NUMBER[ ]*\(.*\)$$/\1/p' $(srcdir)/versionn.h` ; \ $(CC) -c $(CFLAGS) -o $@ $(srcdir)/config.c \ diff --git a/mozilla/cmd/xfe/Microline3.0/XmL/Makefile.in b/mozilla/cmd/xfe/Microline3.0/XmL/Makefile.in index 0c2099d6674..4f81ab76713 100644 --- a/mozilla/cmd/xfe/Microline3.0/XmL/Makefile.in +++ b/mozilla/cmd/xfe/Microline3.0/XmL/Makefile.in @@ -34,8 +34,8 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -82,7 +82,8 @@ EXPORTS = \ XmL.h \ $(NULL) -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) include $(topsrcdir)/config/rules.mk +DEFINES += $(XFE_EXTRA_DEFINES) diff --git a/mozilla/cmd/xfe/XfeWidgets/Makefile.in b/mozilla/cmd/xfe/XfeWidgets/Makefile.in index 3f0e45e70f1..16d4c89c842 100644 --- a/mozilla/cmd/xfe/XfeWidgets/Makefile.in +++ b/mozilla/cmd/xfe/XfeWidgets/Makefile.in @@ -26,12 +26,12 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS +ifdef ENABLE_TESTS ifdef XFE_WIDGETS_BUILD_TESTS TEST_DIRS = \ XfeTest \ @@ -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 diff --git a/mozilla/cmd/xfe/XfeWidgets/tests/Makefile.in b/mozilla/cmd/xfe/XfeWidgets/tests/Makefile.in index efd4eb2b2e4..1c3e0488875 100644 --- a/mozilla/cmd/xfe/XfeWidgets/tests/Makefile.in +++ b/mozilla/cmd/xfe/XfeWidgets/tests/Makefile.in @@ -33,8 +33,9 @@ include $(DEPTH)/config/autoconf.mk ifdef XFE_WIDGETS_BUILD_UNUSED UNUSED_DIRS = \ - XfeComboBox \ XfeCaption \ + XfeComboBox \ + XfeToolTip \ $(NULL) endif diff --git a/mozilla/cmd/xfe/src/Makefile.in b/mozilla/cmd/xfe/src/Makefile.in index d9e219c9a05..a98142575b4 100644 --- a/mozilla/cmd/xfe/src/Makefile.in +++ b/mozilla/cmd/xfe/src/Makefile.in @@ -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 \ diff --git a/mozilla/config/Makefile.in b/mozilla/config/Makefile.in index 89bb1517e39..47083ede1bf 100644 --- a/mozilla/config/Makefile.in +++ b/mozilla/config/Makefile.in @@ -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) diff --git a/mozilla/configure.in b/mozilla/configure.in index b7b460b5c05..b78e5f96537 100644 --- a/mozilla/configure.in +++ b/mozilla/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 diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in index 0932d05f007..5193af6a47d 100644 --- a/mozilla/js/src/Makefile.in +++ b/mozilla/js/src/Makefile.in @@ -110,8 +110,6 @@ endif include $(topsrcdir)/config/rules.mk -export:: install - ifndef BUILD_OPT MOCHAFILE = 1 endif diff --git a/mozilla/lib/Makefile.in b/mozilla/lib/Makefile.in index 0fa4c2a8d2e..083b492eb3d 100644 --- a/mozilla/lib/Makefile.in +++ b/mozilla/lib/Makefile.in @@ -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 diff --git a/mozilla/lib/layout/Makefile.in b/mozilla/lib/layout/Makefile.in index 0d93868167e..c302d25e275 100644 --- a/mozilla/lib/layout/Makefile.in +++ b/mozilla/lib/layout/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -31,8 +31,8 @@ CSRCS = bullet.c \ clipline.c \ layarena.c \ layblock.c \ - laybuiltin.c \ - laycell.c \ + laybuiltin.c \ + laycell.c \ laycols.c \ laydisp.c \ layembed.c \ @@ -55,9 +55,9 @@ CSRCS = bullet.c \ laylayer.c \ layrelay.c \ laytrav.c \ - $(NULL) + $(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 @@ -85,7 +85,7 @@ CPPSRCS = streams.cpp \ $(NULL) endif -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/lib/libi18n/Makefile.in b/mozilla/lib/libi18n/Makefile.in index 9355c6434ef..1ad77fc9ce6 100644 --- a/mozilla/lib/libi18n/Makefile.in +++ b/mozilla/lib/libi18n/Makefile.in @@ -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 diff --git a/mozilla/lib/libmime/Makefile.in b/mozilla/lib/libmime/Makefile.in index e262ad51d47..d40694fada8 100644 --- a/mozilla/lib/libmime/Makefile.in +++ b/mozilla/lib/libmime/Makefile.in @@ -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 @@ -68,56 +71,26 @@ ifdef MOZ_SECURITY INCLUDES += -I$(DEPTH)/lib/libmime -I$(DIST)/public/security endif -INCLUDES += -I$(srcdir)/ +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) diff --git a/mozilla/lib/xp/Makefile.in b/mozilla/lib/xp/Makefile.in index 99ae170f025..293d8588570 100644 --- a/mozilla/lib/xp/Makefile.in +++ b/mozilla/lib/xp/Makefile.in @@ -19,8 +19,8 @@ DEPTH = ../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -30,7 +30,7 @@ MODULE = xp LIBRARY_NAME = xp ifndef MODULAR_NETLIB -CSRCS = \ +CSRCS = \ xp_alloc.c \ xp_cntxt.c \ xp_core.c \ @@ -46,17 +46,22 @@ CSRCS = \ xp_wrap.c \ xpassert.c \ xplocale.c \ + xp_linebuf.c \ $(NULL) else -CSRCS = xp_stub.c +CSRCS = xp_stub.c endif CSRCS += \ - xp_file.c \ - xp_list.c \ - xp_hash.c \ - allxpstr.c \ - $(NULL) + xp_file.c \ + xp_list.c \ + xp_hash.c \ + 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 @@ -70,7 +75,7 @@ endif include $(topsrcdir)/config/rules.mk -EMACS = lemacs +#EMACS = lemacs AUDIO_FILES = $(wildcard $(srcdir)/*.au) GIF_FILES = $(wildcard $(srcdir)/*.gif) diff --git a/mozilla/modules/edtplug/classes/Makefile.in b/mozilla/modules/edtplug/classes/Makefile.in index bb805a10432..677333bbe94 100644 --- a/mozilla/modules/edtplug/classes/Makefile.in +++ b/mozilla/modules/edtplug/classes/Makefile.in @@ -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 diff --git a/mozilla/modules/libimg/Makefile.in b/mozilla/modules/libimg/Makefile.in index 64a25d3225e..563302efc21 100644 --- a/mozilla/modules/libimg/Makefile.in +++ b/mozilla/modules/libimg/Makefile.in @@ -23,7 +23,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk ifdef STANDALONE_IMAGE_LIB -DIRS = png public src +DIRS = png public src EXTRA_LIBS = libzlib.a libpng.a else DIRS = classes public src diff --git a/mozilla/modules/libimg/png/Makefile.in b/mozilla/modules/libimg/png/Makefile.in index fc2425fd0ab..11dcc58484d 100644 --- a/mozilla/modules/libimg/png/Makefile.in +++ b/mozilla/modules/libimg/png/Makefile.in @@ -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) diff --git a/mozilla/modules/libimg/src/Makefile.in b/mozilla/modules/libimg/src/Makefile.in index 9e6fd8ca2c9..a7bdf781a1f 100644 --- a/mozilla/modules/libimg/src/Makefile.in +++ b/mozilla/modules/libimg/src/Makefile.in @@ -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,23 +81,27 @@ 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 -REQUIRES += zlib -LOCAL_INCLUDES += -I$(DEPTH)/dist/public/zlib -EXTRA_LIBS += $(DIST)/lib/libzlib.a +ifdef MOZ_NATIVE_PNG +EXTRA_LIBS += -lpng +else +REQUIRES += png +LOCAL_INCLUDES += -I$(srcdir)/../png +EXTRA_LIBS += $(DIST)/lib/libpng.a endif -ifndef MOZ_NATIVE_PNG -REQUIRES += png -EXTRA_LIBS += $(DIST)/lib/libpng.a +ifdef MOZ_NATIVE_ZLIB +EXTRA_LIBS += -lz +else +REQUIRES += zlib +LOCAL_INCLUDES += -I$(DEPTH)/dist/public/zlib +EXTRA_LIBS += $(DIST)/lib/libzlib.a endif # @@ -108,7 +112,7 @@ JMC_GEN = MIMGCB MPSIMGCB JMC_GEN_FLAGS = -cimpl -noexc -module endif -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/libpref/admin/Makefile.in b/mozilla/modules/libpref/admin/Makefile.in index a28ab540f1a..13649ef70c0 100644 --- a/mozilla/modules/libpref/admin/Makefile.in +++ b/mozilla/modules/libpref/admin/Makefile.in @@ -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 $@ diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index 55eb29df4ed..d858925d85d 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -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 diff --git a/mozilla/modules/plugin/nglsrc/Makefile.in b/mozilla/modules/plugin/nglsrc/Makefile.in index 55eb29df4ed..d858925d85d 100644 --- a/mozilla/modules/plugin/nglsrc/Makefile.in +++ b/mozilla/modules/plugin/nglsrc/Makefile.in @@ -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 diff --git a/mozilla/modules/xml/Makefile.in b/mozilla/modules/xml/Makefile.in index 78c92ade687..bc02e805a5c 100644 --- a/mozilla/modules/xml/Makefile.in +++ b/mozilla/modules/xml/Makefile.in @@ -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) + diff --git a/mozilla/network/Makefile.in b/mozilla/network/Makefile.in index 2d3c7246efb..6d1b9ba0aca 100644 --- a/mozilla/network/Makefile.in +++ b/mozilla/network/Makefile.in @@ -15,13 +15,13 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -# +# # DEPTH = .. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk diff --git a/mozilla/network/cnvts/Makefile.in b/mozilla/network/cnvts/Makefile.in index 69d312cd978..ba578d549da 100644 --- a/mozilla/network/cnvts/Makefile.in +++ b/mozilla/network/cnvts/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -60,12 +60,12 @@ EXPORTS= \ ifndef MODULAR_NETLIB EXPORTS += \ - cvmime.h \ - cvpics.h \ + cvmime.h \ + cvpics.h \ $(NULL) endif -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) REQUIRES = network img lay layer util parse pref js \ security marimurl style zlib softupdt mimetype ldap diff --git a/mozilla/network/main/Makefile.in b/mozilla/network/main/Makefile.in index 99e98732c94..840f82466be 100644 --- a/mozilla/network/main/Makefile.in +++ b/mozilla/network/main/Makefile.in @@ -45,7 +45,7 @@ CSRCS = \ mkselect.c \ mksockrw.c \ mksort.c \ - mkstream.c \ + mkstream.c \ mktrace.c \ mkutils.c \ prefetch.c \ diff --git a/mozilla/network/module/Makefile.in b/mozilla/network/module/Makefile.in index 51dd6aef970..10c893b48d9 100644 --- a/mozilla/network/module/Makefile.in +++ b/mozilla/network/module/Makefile.in @@ -42,12 +42,14 @@ REQUIRES = raptor js dbm nspr security pref xpcom util img \ EXPORTS = nsIStreamListener.h \ nsINetService.h \ - nsINetSupport.h \ + nsINetSupport.h \ nsIURL.h \ nsIRelatedLinks.h \ nsIPostToServer.h \ nsIHttpUrl.h \ nsINetContainerApplication.h \ + nsIRefreshUrl.h \ + nsIConnectionInfo.h \ $(NULL) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) diff --git a/mozilla/network/util/Makefile.in b/mozilla/network/util/Makefile.in index 7f4cefb6029..2cbde1cfe7f 100644 --- a/mozilla/network/util/Makefile.in +++ b/mozilla/network/util/Makefile.in @@ -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 + + diff --git a/mozilla/nsprpub/lib/msgc/tests/Makefile.in b/mozilla/nsprpub/lib/msgc/tests/Makefile.in index 87400a7f352..4f1b3a97f24 100644 --- a/mozilla/nsprpub/lib/msgc/tests/Makefile.in +++ b/mozilla/nsprpub/lib/msgc/tests/Makefile.in @@ -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 diff --git a/mozilla/nsprpub/pr/include/md/Makefile.in b/mozilla/nsprpub/pr/include/md/Makefile.in index 970ab29982d..c9be95e3d36 100644 --- a/mozilla/nsprpub/pr/include/md/Makefile.in +++ b/mozilla/nsprpub/pr/include/md/Makefile.in @@ -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 diff --git a/mozilla/nsprpub/pr/src/md/unix/Makefile.in b/mozilla/nsprpub/pr/src/md/unix/Makefile.in index 1a96f03e29e..ede4856ae26 100644 --- a/mozilla/nsprpub/pr/src/md/unix/Makefile.in +++ b/mozilla/nsprpub/pr/src/md/unix/Makefile.in @@ -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. diff --git a/mozilla/privacy/src/Makefile.in b/mozilla/privacy/src/Makefile.in index 32dc20302f6..bb51d26a5d9 100644 --- a/mozilla/privacy/src/Makefile.in +++ b/mozilla/privacy/src/Makefile.in @@ -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