Adding MOZILLA_INTERNAL_API to internal makefiles, bug 288626, rs=darin

2005-04-04 18:38:19 +00:00 · 2005-04-04 18:38:19 +00:00 · 44c4cbce10
--- a/extensions/access-builtin/accessproxy/Makefile.in
+++ b/extensions/access-builtin/accessproxy/Makefile.in
@ -48,6 +48,8 @@ LIBRARY_NAME = accessproxy
 ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME = accproxy
 endif
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= \
 		  xpcom \
 		  string \
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsCookieModule
 GRE_MODULE	= 1
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE = cookie.pkg

--- a/extensions/datetime/Makefile.in
+++ b/extensions/datetime/Makefile.in
@ -48,6 +48,8 @@ SHORT_LIBNAME	= nkdatetm
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= datetime
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
--- a/extensions/finger/Makefile.in
+++ b/extensions/finger/Makefile.in
@ -47,6 +47,8 @@ LIBRARY_NAME	= nkfinger
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= finger
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
--- a/extensions/gnomevfs/Makefile.in
+++ b/extensions/gnomevfs/Makefile.in
@ -46,6 +46,8 @@ MODULE		= nkgnomevfs
 LIBRARY_NAME	= nkgnomevfs
 SHORT_LIBNAME	= nkgnomevfs
 IS_COMPONENT	= 1
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
--- a/extensions/inspector/base/src/Makefile.in
+++ b/extensions/inspector/base/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE=inspector
 LIBRARY_NAME=inspector_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/extensions/inspector/build/src/Makefile.in
+++ b/extensions/inspector/build/src/Makefile.in
@ -50,6 +50,7 @@ FORCE_SHARED_LIB = 1
 ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME = inspectr
 endif
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE = inspector.pkg

--- a/extensions/java/xpcom/Makefile.in
+++ b/extensions/java/xpcom/Makefile.in
@ -45,6 +45,7 @@ include $(topsrcdir)/config/config.mk

 MODULE		= javaxpcom
 LIBRARY_NAME	= javaxpcom
+MOZILLA_INTERNAL_API = 1

 # On Mac OS X, JNI libraries must end with a '.jnilib' extension
 ifeq ($(OS_ARCH),Darwin)
--- a/extensions/layout-debug/src/Makefile.in
+++ b/extensions/layout-debug/src/Makefile.in
@ -47,6 +47,7 @@ LIBRARY_NAME	= gkdebug
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutDebugModule
+MOZILLA_INTERNAL_API = 1

 REQUIRES	= xpcom \
 		  string \
--- a/extensions/negotiateauth/Makefile.in
+++ b/extensions/negotiateauth/Makefile.in
@ -50,6 +50,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= negotiateauth
 LIBRARY_NAME	= negotiateauth
 IS_COMPONENT	= 1
+MOZILLA_INTERNAL_API = 1

 REQUIRES	= \
 		xpcom \
--- a/extensions/p3p/src/Makefile.in
+++ b/extensions/p3p/src/Makefile.in
@ -46,6 +46,7 @@ LIBRARY_NAME   = p3p
 EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME	   = nsP3PModule
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE = p3p.pkg

--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@ -47,6 +47,7 @@ SHORT_LIBNAME	= perms
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsPermissionsModule
+MOZILLA_INTERNAL_API = 1

 #PACKAGE_FILE	= permissions.pkg

--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@ -48,6 +48,7 @@ endif
 EXPORT_LIBRARY   = 1
 IS_COMPONENT     = 1
 MODULE_NAME      = nsAutoConfigModule
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE     = autoconfig.pkg

--- a/extensions/pref/system-pref/src/Makefile.in
+++ b/extensions/pref/system-pref/src/Makefile.in
@ -51,6 +51,7 @@ endif

 # We want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
+MOZILLA_INTERNAL_API = 1

 REQUIRES        = xpcom \
 		  string \
--- a/extensions/pref/system-pref/src/gconf/Makefile.in
+++ b/extensions/pref/system-pref/src/gconf/Makefile.in
@ -46,6 +46,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = system-pref
 LIBRARY_NAME = system-pref
 GRE_MODULE	= 1
+MOZILLA_INTERNAL_API = 1

 REQUIRES        = pref \
 		  string \
--- a/extensions/schema-validation/src/Makefile.in
+++ b/extensions/schema-validation/src/Makefile.in
@ -50,6 +50,8 @@ SHORT_LIBNAME	= schemval
 FORCE_SHARED_LIB = 1
 IS_COMPONENT	= 1
 GRE_MODULE      = 1
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@ -49,6 +49,7 @@ SHORT_LIBNAME = spellchk
 #EXPORT_LIBRARY  = 1
 FORCE_SHARED_LIB = 1
 IS_COMPONENT	= 1
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE = spellcheck.pkg

--- a/extensions/sql/base/src/Makefile.in
+++ b/extensions/sql/base/src/Makefile.in
@ -42,6 +42,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= sql
 LIBRARY_NAME	= sqlbase_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  unicharutil \
--- a/extensions/sql/build/src/Makefile.in
+++ b/extensions/sql/build/src/Makefile.in
@ -47,6 +47,8 @@ LIBRARY_NAME		= sql
 SHORT_LIBNAME		= sql
 EXPORT_LIBRARY  	= 1
 IS_COMPONENT		= 1
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES		= xpcom \
 		  	  string \
 		  	  rdf \
--- a/extensions/sql/mysql/src/Makefile.in
+++ b/extensions/sql/mysql/src/Makefile.in
@ -42,6 +42,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= sql
 LIBRARY_NAME	= sqlmysql_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  locale \
--- a/extensions/sql/pgsql/src/Makefile.in
+++ b/extensions/sql/pgsql/src/Makefile.in
@ -42,6 +42,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= sql
 LIBRARY_NAME	= sqlpgsql_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  locale \
--- a/extensions/sql/sqlite/src/Makefile.in
+++ b/extensions/sql/sqlite/src/Makefile.in
@ -43,6 +43,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= sql
 LIBRARY_NAME	= sqlsqlite_s
+MOZILLA_INTERNAL_API = 1

 REQUIRES	= xpcom \
 		  string \
--- a/extensions/sroaming/src/Makefile.in
+++ b/extensions/sroaming/src/Makefile.in
@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE=sroaming
 LIBRARY_NAME=sroaming
 IS_COMPONENT	= 1
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
 		  string \
--- a/extensions/transformiix/build/Makefile.in
+++ b/extensions/transformiix/build/Makefile.in
@ -50,6 +50,7 @@ MODULE_NAME = TransformiixModule
 ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME	= t8iix
 endif
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE = transformiix.pkg

--- a/extensions/transformiix/source/base/Makefile.in
+++ b/extensions/transformiix/source/base/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = transformiix
 LIBRARY_NAME = txbase_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= string \
 		  xpcom \
 		  $(NULL)
--- a/extensions/transformiix/source/lib/Makefile.in
+++ b/extensions/transformiix/source/lib/Makefile.in
@ -1,73 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is TransforMiiX XSLT processor code.
-#
-# The Initial Developer of the Original Code is
-# Axel Hecht.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Axel Hecht <axel@pike.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH           = ../../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME = tx
-FORCE_STATIC_LIB = 1
-CPP_PROG_LINK = 1
-
-REQUIRES = string \
-        xpcom \
-        expat \
-        $(NULL)
-
-SHARED_LIBRARY_LIBS = \
-        $(DIST)/lib/$(LIB_PREFIX)txbase_s.$(LIB_SUFFIX) \
-        $(DIST)/lib/$(LIB_PREFIX)txxml_s.$(LIB_SUFFIX) \
-        $(DIST)/lib/$(LIB_PREFIX)txxmldom_s.$(LIB_SUFFIX) \
-        $(DIST)/lib/$(LIB_PREFIX)txxmlparser_s.$(LIB_SUFFIX) \
-        $(DIST)/lib/$(LIB_PREFIX)txxpath_s.$(LIB_SUFFIX) \
-        $(DIST)/lib/$(LIB_PREFIX)txxslt_s.$(LIB_SUFFIX) \
-        $(DIST)/lib/$(LIB_PREFIX)txxsltfunctions_s.$(LIB_SUFFIX) \
-        $(DIST)/lib/$(LIB_PREFIX)txxsltutil_s.$(LIB_SUFFIX) \
-        $(DIST)/lib/$(LIB_PREFIX)expat_s.$(LIB_SUFFIX) \
-        $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES += -I$(srcdir)/../xslt -I$(srcdir)/../base -I$(srcdir)/../net \
-  -I$(srcdir)/../xml -I$(srcdir)/../xml/dom \
-  -I$(srcdir)/../xml/parser \
-  -I$(srcdir)/../xpath -I$(srcdir)/../xslt/util \
-  -I$(srcdir)/../xslt/functions $(MARK_INC)
-DEFINES		+= -DXML_DTD -DXML_UNICODE
--- a/extensions/transformiix/source/main/Makefile.in
+++ b/extensions/transformiix/source/main/Makefile.in
@ -1,78 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is TransforMiiX XSLT processor code.
-#
-# The Initial Developer of the Original Code is
-# Axel Hecht.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Axel Hecht <axel@pike.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH           = ../../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-SIMPLE_PROGRAMS = transformiix$(BIN_SUFFIX) testXalan$(BIN_SUFFIX) \
-                  txTestExpr$(BIN_SUFFIX)
-ifdef MARK_INC
-SIMPLE_PROGRAMS += txXSLTMarkDriver$(BIN_SUFFIX)
-endif
-
-REQUIRES = string \
-	   xpcom \
-	   expat \
-	   jprof \
-	   $(NULL)
-
-CPP_PROG_LINK          = 1
-
-EXTRA_DEPS = \
-             $(DIST)/lib/$(LIB_PREFIX)tx.$(LIB_SUFFIX) \
-             $(NULL)
-
-EXTRA_LIBS = \
-             $(DIST)/lib/$(LIB_PREFIX)tx.$(LIB_SUFFIX) \
-             $(MOZ_COMPONENT_LIBS) \
-             $(NULL)
-
-ifdef MOZ_JPROF
-LIBS         += -ljprof
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES += -I$(srcdir)/../xslt -I$(srcdir)/../base -I$(srcdir)/../net \
-  -I$(srcdir)/../xml -I$(srcdir)/../xml/dom \
-  -I$(srcdir)/../xml/parser \
-  -I$(srcdir)/../xpath -I$(srcdir)/../xslt/util \
-  -I$(srcdir)/../xslt/functions $(MARK_INC)
--- a/extensions/transformiix/source/xml/Makefile.in
+++ b/extensions/transformiix/source/xml/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = transformiix
 LIBRARY_NAME = txxml_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= string \
 		  xpcom \
 		  $(NULL)
--- a/extensions/transformiix/source/xml/dom/standalone/Makefile.in
+++ b/extensions/transformiix/source/xml/dom/standalone/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = transformiix
 LIBRARY_NAME = txxmldom_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= string \
 		  xpcom \
 		  $(NULL)
--- a/extensions/transformiix/source/xml/parser/Makefile.in
+++ b/extensions/transformiix/source/xml/parser/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = transformiix
 LIBRARY_NAME = txxmlparser_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES = string \
        xpcom \
        $(NULL)
--- a/extensions/transformiix/source/xpath/Makefile.in
+++ b/extensions/transformiix/source/xpath/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = transformiix
 LIBRARY_NAME = txxpath_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= string \
 		  xpcom \
 		  $(NULL)
--- a/extensions/transformiix/source/xslt/Makefile.in
+++ b/extensions/transformiix/source/xslt/Makefile.in
@ -1,120 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is TransforMiiX XSLT processor code.
-#
-# The Initial Developer of the Original Code is
-# Axel Hecht.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Axel Hecht <axel@pike.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH           = ../../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS            = functions util
-
-MODULE = transformiix
-LIBRARY_NAME = txxslt_s
-REQUIRES	= string \
-		  xpcom \
-		  $(NULL)
-
-ifndef TX_EXE
-REQUIRES +=	  dom \
-		  content \
-		  widget \
-		  necko \
-		  unicharutil \
-		  xpconnect \
-		  js \
-		  htmlparser \
-		  webshell \
-		  docshell \
-		  layout \
-		  uconv \
-		  caps \
-		  windowwatcher \
-		  mimetype \
-		  intl \
-		  htmlparser \
-		  $(NULL)
-else
-REQUIRES +=	  expat \
-		  $(NULL)
-endif
-
-CPPSRCS = \
-        txBufferingHandler.cpp \
-        txExecutionState.cpp \
-        txInstructions.cpp \
-        txOutputFormat.cpp \
-        txRtfHandler.cpp \
-        txStylesheet.cpp \
-        txStylesheetCompileHandlers.cpp \
-        txStylesheetCompiler.cpp \
-        txTextHandler.cpp \
-        txToplevelItems.cpp \
-        txXSLTNumber.cpp \
-        txXSLTNumberCounters.cpp \
-        txXSLTPatterns.cpp \
-        txXSLTProcessor.cpp \
-        txPatternParser.cpp \
-        txUnknownHandler.cpp
-
-ifdef TX_EXE
-CPPSRCS += txHTMLOutput.cpp	\
-           txStandaloneXSLTProcessor.cpp \
-           txStandaloneStylesheetCompiler.cpp \
-           txTextOutput.cpp \
-           txXMLOutput.cpp
-else
-CPPSRCS += txMozillaStylesheetCompiler.cpp \
-           txMozillaTextOutput.cpp \
-           txMozillaXMLOutput.cpp \
-           txMozillaXSLTProcessor.cpp
-endif
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES += -I$(srcdir) -I$(srcdir)/../base \
-  -I$(srcdir)/../xml -I$(srcdir)/../xml/dom \
-  -I$(srcdir)/../xml/parser \
-  -I$(srcdir)/../xpath -I$(srcdir)/util -I$(srcdir)/functions
-ifdef TX_EXE
-DEFINES	 += -DXML_DTD -DXML_UNICODE
-endif
--- a/extensions/transformiix/source/xslt/functions/Makefile.in
+++ b/extensions/transformiix/source/xslt/functions/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = transformiix
 LIBRARY_NAME = txxsltfunctions_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= string \
 		  xpcom \
 		  $(NULL)
--- a/extensions/transformiix/source/xslt/util/Makefile.in
+++ b/extensions/transformiix/source/xslt/util/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = transformiix
 LIBRARY_NAME = txxsltutil_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= string \
 		  xpcom \
 		  $(NULL)
--- a/extensions/tridentprofile/src/Makefile.in
+++ b/extensions/tridentprofile/src/Makefile.in
@ -49,6 +49,7 @@ endif
 EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME    = nsTridentProfile
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE = tridentprofile.pkg

--- a/extensions/typeaheadfind/src/Makefile.in
+++ b/extensions/typeaheadfind/src/Makefile.in
@ -47,6 +47,7 @@ ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME = typahead
 endif
 GRE_MODULE	= 1
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE = typeaheadfind.pkg

--- a/extensions/universalchardet/src/Makefile.in
+++ b/extensions/universalchardet/src/Makefile.in
@ -50,6 +50,8 @@ MODULE_NAME	= nsUniversalCharDetModule
 ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME	= ucdet
 endif
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  uconv \
--- a/extensions/universalchardet/tests/Makefile.in
+++ b/extensions/universalchardet/tests/Makefile.in
@ -43,6 +43,8 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= universalchardet
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  chardet \
 		  $(NULL)
--- a/extensions/wallet/build/Makefile.in
+++ b/extensions/wallet/build/Makefile.in
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= wlltvwrs
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWalletViewerModule
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE = walletviewer.pkg

--- a/extensions/wallet/editor/Makefile.in
+++ b/extensions/wallet/editor/Makefile.in
@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= walletviewers
 LIBRARY_NAME	= walleteditor_s
 XPIDL_MODULE	= walleteditor
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  wallet \
--- a/extensions/wallet/signonviewer/Makefile.in
+++ b/extensions/wallet/signonviewer/Makefile.in
@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= walletviewers
 LIBRARY_NAME	= signonviewer_s
 XPIDL_MODULE	= signonviewer
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  wallet \
--- a/extensions/wallet/src/Makefile.in
+++ b/extensions/wallet/src/Makefile.in
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWalletModule
 GRE_MODULE	= 1
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE = wallet.pkg

--- a/extensions/wallet/walletpreview/Makefile.in
+++ b/extensions/wallet/walletpreview/Makefile.in
@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= walletviewers
 LIBRARY_NAME	= walletpreview_s
 XPIDL_MODULE	= walletpreview
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  wallet \
--- a/extensions/webdav/src/Makefile.in
+++ b/extensions/webdav/src/Makefile.in
@ -52,6 +52,7 @@ IS_COMPONENT    = 1
 MODULE_NAME     = nsWebDAVModules
 GRE_MODULE      = 1
 # PACKAGE_FILE    = webdav.pkg
+MOZILLA_INTERNAL_API = 1

 # XXX widget is because of a transitive inclusion from nsIDocument.h of
 # XXX nsEvent.h -- I mean, really!
--- a/extensions/webservices/build/src/Makefile.in
+++ b/extensions/webservices/build/src/Makefile.in
@ -47,6 +47,7 @@ LIBRARY_NAME    = websrvcs
 EXPORT_LIBRARY  = 1
 IS_COMPONENT    = 1
 MODULE_NAME     = nsWebServicesModule
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE    = webservices.pkg

--- a/extensions/webservices/interfaceinfo/src/Makefile.in
+++ b/extensions/webservices/interfaceinfo/src/Makefile.in
@ -46,6 +46,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE    = websrvcs
 LIBRARY_NAME	= websrvcsinterfaceinfo_s
+MOZILLA_INTERNAL_API = 1

 REQUIRES	= xpcom \
 		  string \
--- a/extensions/webservices/proxy/src/Makefile.in
+++ b/extensions/webservices/proxy/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE    = websrvcs
 LIBRARY_NAME	= websrvcsproxy_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  xpconnect \
--- a/extensions/webservices/proxy/tests/Makefile.in
+++ b/extensions/webservices/proxy/tests/Makefile.in
@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1
 XPIDL_MODULE	= wsproxytest
 IS_COMPONENT	= 1
 MODULE_NAME	= WSPProxyTestModule
+MOZILLA_INTERNAL_API = 1

 REQUIRES	= xpcom \
 		  string \
--- a/extensions/webservices/schema/src/Makefile.in
+++ b/extensions/webservices/schema/src/Makefile.in
@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE    = websrvcs
 LIBRARY_NAME	= websrvcsschema_s
+MOZILLA_INTERNAL_API = 1

 REQUIRES	= xpcom \
 		  string \
--- a/extensions/webservices/security/src/Makefile.in
+++ b/extensions/webservices/security/src/Makefile.in
@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE         = websrvcs
 LIBRARY_NAME   = websrvcssecurity_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  caps \
--- a/extensions/webservices/soap/src/Makefile.in
+++ b/extensions/webservices/soap/src/Makefile.in
@ -43,6 +43,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE        = websrvcs
 LIBRARY_NAME  = websrvcssoap_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  caps \
--- a/extensions/webservices/wsdl/src/Makefile.in
+++ b/extensions/webservices/wsdl/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE    = websrvcs
 LIBRARY_NAME	= websrvcswsdl_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/extensions/xforms/Makefile.in
+++ b/extensions/xforms/Makefile.in
@ -50,6 +50,7 @@ IS_COMPONENT	= 1
 # Do not set EXPORT_LIBRARY as we do not want xforms in the static libs list
 #EXPORT_LIBRARY	= 1
 FORCE_SHARED_LIB = 1
+MOZILLA_INTERNAL_API = 1

 REQUIRES	= \
 		xpcom \
--- a/extensions/xmlextras/base/src/Makefile.in
+++ b/extensions/xmlextras/base/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextrasbase_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/extensions/xmlextras/build/src/Makefile.in
+++ b/extensions/xmlextras/build/src/Makefile.in
@ -51,6 +51,7 @@ endif
 IS_COMPONENT	= 1
 MODULE_NAME	= nsXMLExtrasModule
 GRE_MODULE	= 1
+MOZILLA_INTERNAL_API = 1

 PACKAGE_FILE = xmlextras.pkg

--- a/extensions/xmlextras/ls/src/Makefile.in
+++ b/extensions/xmlextras/ls/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextrasls_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  dom \
--- a/extensions/xmlextras/pointers/src/Makefile.in
+++ b/extensions/xmlextras/pointers/src/Makefile.in
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextraspointers_s
+MOZILLA_INTERNAL_API = 1
+
 REQUIRES = xpcom \
 	   string \
 	   dom \
--- a/extensions/xmlextras/tests/Makefile.in
+++ b/extensions/xmlextras/tests/Makefile.in
@ -42,6 +42,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MOZILLA_INTERNAL_API = 1
+
 REQUIRES	= xpcom \
 		  string \
 		  xmlextras \
--- a/extensions/xmlterm/base/Makefile.in
+++ b/extensions/xmlterm/base/Makefile.in
@ -1,116 +0,0 @@
-#!gmake
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is lineterm.
-#
-# The Initial Developer of the Original Code is
-# Ramalingam Saravanan.
-# Portions created by the Initial Developer are Copyright (C) 1999
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# makefile for xmlterm/base directory
-
-DEPTH      = ../../..
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH	   = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
-ifdef DEBUG
-# Debug option
-DEBUG_LTERM = 1
-endif
-
-# Defines
-ifdef DEBUG_LTERM
-DEFINES += -DDEBUG_LTERM
-endif
-
-# Exported header files (excluding XPCONNECT interfaces)
-EXPORTS = mozXMLT.h mozXMLTermUtils.h
-
-# C++ Sources
-CPPSRCS = \
-	mozLineTerm.cpp		 \
-	mozXMLTermUtils.cpp	 \
-	mozXMLTerminal.cpp       \
-	mozXMLTermSession.cpp    \
-	mozXMLTermListeners.cpp	 \
-	mozXMLTermShell.cpp	 \
-	mozXMLTermStream.cpp	 \
-	$(NULL)
-
-MODULE = xmlterm
-LIBRARY_NAME = xmlterm_s
-
-REQUIRES	= xpcom \
-		  string \
-		  gfx \
-		  layout \
-		  content \
-		  docshell \
-		  caps \
-		  pref \
-		  dom \
-		  js \
-		  view \
-		  widget \
-		  necko \
-		  webshell \
-		  uriloader \
-		  appshell \
-		  locale \
-		  $(NULL)
-
-XPIDLSRCS = \
-	mozILineTerm.idl      \
-	mozIXMLTermShell.idl  \
-	mozIXMLTerminal.idl   \
-	mozIXMLTermStream.idl \
-	$(NULL)
-
-LOCAL_INCLUDES	= \
-		-I$(srcdir)/../lineterm \
-		$(NULL)
-
-FORCE_STATIC_LIB = 1
-
-include $(srcdir)/../config/xmlterm_config.mk
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS += $(MOZ_GTK_CFLAGS)
-
-ifndef STAND_ALONE
-ifeq ($(OS_ARCH),Linux)
-OS_CFLAGS += -ansi
-endif
-endif
--- a/extensions/xmlterm/build/Makefile.in
+++ b/extensions/xmlterm/build/Makefile.in
@ -1,123 +0,0 @@
-#!gmake
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is XMLterm.
-#
-# The Initial Developer of the Original Code is
-# Ramalingam Saravanan.
-# Portions created by the Initial Developer are Copyright (C) 1999
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# Makefile for xmlterm/build directory
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-# Debug option
-DEBUG = 1
-
-XPI_MODULE	= xmlterm
-XPI_MODULE_VERS = 0.53
-
-MODULE		= xmlterm
-LIBRARY_NAME	= xmlterm
-EXPORT_LIBRARY  = 1
-SHORT_LIBNAME	= xmlterm
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom \
-		  string \
-		  dom \
-		  js \
-		  gfx \
-		  layout \
-		  content \
-		  widget \
-		  uriloader \
-		  webshell \
-		  necko \
-		  $(NULL)
-
-
-MODULE_NAME	= mozXMLTermModule
-
-CPPSRCS         = mozXMLTermModule.cpp
-
-SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/liblineterm_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxmlterm_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-LOCAL_INCLUDES	= \
-		-I$(srcdir)/../base \
-		-I$(srcdir)/../lineterm \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-                -lgkgfx \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_GTK_LDFLAGS) \
-		$(NULL)
-
-include $(srcdir)/../config/xmlterm_config.mk
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS += $(MOZ_GTK_CFLAGS)
-
-PLATFORM_STR = unknown
-
-# Edit the lines below as needed, depending upon your platform(s)
-ifeq ($(OS_ARCH),Linux)
-PLATFORM_STR = linux2-ix86
-endif
-
-ifeq ($(OS_CONFIG),SunOS5)
-PLATFORM_STR = sunos5-sparc
-endif
-
-ifeq ($(OS_ARCH),FreeBSD)
-PLATFORM_STR = freebsd-ix86
-endif
-
-XPIFILE = $(XPI_MODULE)-$(XPI_MODULE_VERS)-$(PLATFORM_STR).xpi
-
-xpi::
-	zip -r $(DIST)/bin/$(XPIFILE) install.js
-	cd $(DIST)/bin; zip -g $(XPIFILE) \
-               components/$(XPI_MODULE).xpt \
-               components/lib$(XPI_MODULE).so
-	echo Created $(DIST)/bin/$(XPIFILE)