diff --git a/editor/composer/.cvsignore b/editor/composer/.cvsignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/editor/composer/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/editor/composer/Makefile.in b/editor/composer/Makefile.in
index 2ad69d246ea..80cc4208bb8 100644
--- a/editor/composer/Makefile.in
+++ b/editor/composer/Makefile.in
@@ -28,5 +28,12 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= src
 
+# Enable Editor API Logging!
+ENABLE_EDITOR_API_LOG=1
+
+ifdef ENABLE_EDITOR_API_LOG
+DEFINES += -DENABLE_EDITOR_API_LOG
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/editor/composer/makefile.win b/editor/composer/makefile.win
new file mode 100644
index 00000000000..57923c87bac
--- /dev/null
+++ b/editor/composer/makefile.win
@@ -0,0 +1,27 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..
+
+DIRS= public src
+
+include <$(DEPTH)\config\rules.mak>
+
diff --git a/editor/composer/src/.cvsignore b/editor/composer/src/.cvsignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/editor/composer/src/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/editor/composer/src/makefile.win b/editor/composer/src/makefile.win
new file mode 100644
index 00000000000..0b0930784ba
--- /dev/null
+++ b/editor/composer/src/makefile.win
@@ -0,0 +1,73 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..
+
+include <$(DEPTH)/config/config.mak>
+
+LIBRARY_NAME=composer
+
+CPPSRCS =                                \
+          nsEditorShell.cpp              \
+          nsEditorShellMouseListener.cpp \
+          nsInterfaceState.cpp           \
+          nsComposerController.cpp       \
+          nsComposerCommands.cpp         \
+          nsComposerRegistration.cpp     \
+          nsEditorParserObserver.cpp     \
+          $(NULL)
+
+CPP_OBJS =                                            \
+          .\$(OBJDIR)\nsEditorShell.obj              \
+          .\$(OBJDIR)\nsEditorShellMouseListener.obj \
+          .\$(OBJDIR)\nsInterfaceState.obj           \
+          .\$(OBJDIR)\nsComposerController.obj       \
+          .\$(OBJDIR)\nsComposerCommands.obj         \
+          .\$(OBJDIR)\nsComposerRegistration.obj     \
+          .\$(OBJDIR)\nsEditorParserObserver.obj     \
+           $(NULL)
+
+MODULE=composer 
+
+MAKE_OBJ_TYPE = DLL
+DLLNAME = composer
+DLL=.\$(OBJDIR)\$(DLLNAME).dll
+
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+# These are the libraries we need to link with to create the dll
+LLIBS =                                \
+        $(DIST)\lib\xpcom.lib          \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\components\$(DLLNAME).dll
+	rm -f $(DIST)\lib\$(DLLNAME).lib
diff --git a/editor/libeditor/.cvsignore b/editor/libeditor/.cvsignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/editor/libeditor/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/editor/libeditor/Makefile.in b/editor/libeditor/Makefile.in
index d9e74bb7da4..ea4d6a8c59a 100644
--- a/editor/libeditor/Makefile.in
+++ b/editor/libeditor/Makefile.in
@@ -28,17 +28,5 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= base text html build
 
-# Enable Editor API Logging!
-ENABLE_EDITOR_API_LOG=1
-
-ifdef ENABLE_EDITOR_API_LOG
-DEFINES += -DENABLE_EDITOR_API_LOG
-endif
-
 include $(topsrcdir)/config/rules.mk
 
-install::
-	@$(REGCHROME) content editor comm.jar
-	@$(REGCHROME) content editor-region comm.jar
-	@$(REGCHROME) locale en-US/editor en-US.jar
-	@$(REGCHROME) locale US/editor-region US.jar
diff --git a/editor/libeditor/base/.cvsignore b/editor/libeditor/base/.cvsignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/editor/libeditor/base/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in
index 0b4d2a90ab5..60ec6fb01da 100644
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@@ -26,7 +26,45 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= src
+MODULE		= editor
+LIBRARY_NAME	= editorbase_s
+# REQUIRES	= xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc
+
+# Internal header files, needed by other editor sublibs:
+INTERNAL_HDR_DIR = ../internal
+
+CPPSRCS		=                           \
+		nsEditor.cpp                \
+		nsEditorCommands.cpp        \
+		nsEditorController.cpp      \
+		nsEditorService.cpp         \
+		nsEditorUtils.cpp           \
+		nsSelectionState.cpp        \
+		$(NULL)
+
+# Transactions: we'd like to split these off,
+# but currently they and nsEditor are too intertwined!
+CPPSRCS		+=                          \
+		EditTxn.cpp                 \
+		PlaceholderTxn.cpp          \
+		ChangeAttributeTxn.cpp      \
+		CreateElementTxn.cpp        \
+		DeleteElementTxn.cpp        \
+		DeleteRangeTxn.cpp          \
+		DeleteTextTxn.cpp           \
+		EditAggregateTxn.cpp        \
+		IMETextTxn.cpp              \
+		InsertElementTxn.cpp        \
+		InsertTextTxn.cpp           \
+		JoinElementTxn.cpp          \
+		SetDocTitleTxn.cpp          \
+		SplitElementTxn.cpp         \
+		nsStyleSheetTxns.cpp        \
+		TransactionFactory.cpp      \
+		$(NULL)
+
+# don't want the shared lib; force the creation of a static lib.
+FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/editor/libeditor/base/makefile.win b/editor/libeditor/base/makefile.win
index 18931a3eb90..04995e9fe85 100644
--- a/editor/libeditor/base/makefile.win
+++ b/editor/libeditor/base/makefile.win
@@ -21,7 +21,80 @@
 
 DEPTH=..\..\..
 
-DIRS= public src
+LIBRARY_NAME=libbaseeditor_s
+
+CPPSRCS =                          \
+          ChangeAttributeTxn.cpp   \
+          CreateElementTxn.cpp     \
+          DeleteElementTxn.cpp     \
+          DeleteRangeTxn.cpp       \
+          DeleteTextTxn.cpp        \
+          EditAggregateTxn.cpp     \
+          EditTxn.cpp              \
+          IMETextTxn.cpp           \
+          InsertElementTxn.cpp     \
+          InsertTextTxn.cpp        \
+          JoinElementTxn.cpp       \
+          PlaceholderTxn.cpp       \
+          SetDocTitleTxn.cpp       \
+          SplitElementTxn.cpp      \
+          TransactionFactory.cpp   \
+          nsEditor.cpp             \
+          nsEditorCommands.cpp     \
+          nsEditorController.cpp   \
+          nsEditorService.cpp      \
+          nsEditorUtils.cpp        \
+          nsSelectionState.cpp     \
+          nsStyleSheetTxns.cpp     \
+          $(NULL)
+
+CPP_OBJS =                                      \
+           .\$(OBJDIR)\ChangeAttributeTxn.obj   \
+           .\$(OBJDIR)\CreateElementTxn.obj     \
+           .\$(OBJDIR)\DeleteElementTxn.obj     \
+           .\$(OBJDIR)\DeleteRangeTxn.obj       \
+           .\$(OBJDIR)\DeleteTextTxn.obj        \
+           .\$(OBJDIR)\EditAggregateTxn.obj     \
+           .\$(OBJDIR)\EditTxn.obj              \
+           .\$(OBJDIR)\IMETextTxn.obj           \
+           .\$(OBJDIR)\InsertElementTxn.obj     \
+           .\$(OBJDIR)\InsertTextTxn.obj        \
+           .\$(OBJDIR)\JoinElementTxn.obj       \
+           .\$(OBJDIR)\PlaceholderTxn.obj       \
+           .\$(OBJDIR)\SetDocTitleTxn.obj       \
+           .\$(OBJDIR)\SplitElementTxn.obj      \
+           .\$(OBJDIR)\TransactionFactory.obj   \
+           .\$(OBJDIR)\nsEditor.obj             \
+           .\$(OBJDIR)\nsEditorCommands.obj     \
+           .\$(OBJDIR)\nsEditorController.obj   \
+           .\$(OBJDIR)\nsEditorService.obj      \
+           .\$(OBJDIR)\nsEditorUtils.obj        \
+           .\$(OBJDIR)\nsSelectionState.obj     \
+           .\$(OBJDIR)\nsStyleSheetTxns.obj     \
+           $(NULL)
+
+MODULE=editor 
+
+LCFLAGS =            \
+          $(LCFLAGS) \
+          $(DEFINES) \
+          $(NULL)
+
+# These are the libraries we need to link with to create the dll
+# LLIBS =                                \
+#         $(DIST)\lib\xpcom.lib          \
+#         $(DIST)\lib\js3250.lib         \
+#         $(DIST)\lib\gkparser.lib       \
+#         $(DIST)\lib\raptorwidget_s.lib \
+#         $(DIST)\lib\timer_s.lib        \
+#         $(LIBNSPR)                     \
+#         $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+	rm -f $(PDBFILE).pdb
diff --git a/editor/libeditor/build/.cvsignore b/editor/libeditor/build/.cvsignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/editor/libeditor/build/Makefile.in b/editor/libeditor/build/Makefile.in
index 82e478736b4..bb4d44ce746 100644
--- a/editor/libeditor/build/Makefile.in
+++ b/editor/libeditor/build/Makefile.in
@@ -30,7 +30,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= editor
 LIBRARY_NAME	= editor
-EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 EXTRA_DSO_LDOPTS = \
 		$(MOZ_NECKO_UTIL_LIBS)   \
@@ -76,8 +75,9 @@ SHARED_LIBRARY_LIBS = $(NULL)
 else
 CPPSRCS = nsEditorRegistration.cpp
 SHARED_LIBRARY_LIBS = \
-		../html/src/libhtmleditor_s.$(LIB_SUFFIX)        \
+		../html/libhtmleditor_s.$(LIB_SUFFIX)      \
 		$(NULL)
+#		../composer/src/libcomposer_s.$(LIB_SUFFIX)    
 endif
 
 #ifndef MKSHLIB_FORCE_ALL
@@ -86,8 +86,8 @@ endif
 
 # These libraries always get built:
 SHARED_LIBRARY_LIBS += \
-		../text/src/libtexteditor_s.$(LIB_SUFFIX)        \
-		../base/src/libeditorbase_s.$(LIB_SUFFIX)        \
+		../text/libtexteditor_s.$(LIB_SUFFIX)      \
+		../base/libeditorbase_s.$(LIB_SUFFIX)      \
 		$(NULL)
 
 ifdef ENABLE_EDITOR_API_LOG
@@ -96,5 +96,5 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += -I../base/src -I../text/src -I../html/src
+INCLUDES += -I../base -I../text -I../html -I../../composer/src
 
diff --git a/editor/libeditor/build/makefile.win b/editor/libeditor/build/makefile.win
index 0b7c32a18af..493ab1a1c58 100644
--- a/editor/libeditor/build/makefile.win
+++ b/editor/libeditor/build/makefile.win
@@ -1,108 +1,132 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-include <$(DEPTH)/config/config.mak>
-
-MODULE       = editor 
-LIBRARY_NAME = texteditor
-
-# Uncomment the line below, or define MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY
-# in your environment, to build only the plain text editor core files:
-# MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY=1
-
-!if defined(MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY)
-
-CPPSRCS =                          \
-          $(CPPSRCS)               \
-          nsTextEditorReg.cpp      \
-          $(NULL)
-
-CPP_OBJS =                                 \
-           $(CPP_OBJS)                     \
-           .\$(OBJDIR)\nsTextEditorReg.obj \
-           $(NULL)
-
-!else
-
-CPPSRCS =                          \
-          $(CPPSRCS)               \
-          nsEditorRegistration.cpp \
-          $(NULL)
-
-CPP_OBJS =                                      \
-           $(CPP_OBJS)                          \
-           .\$(OBJDIR)\nsEditorRegistration.obj \
-           $(NULL)
-
-#Enable Editor API Logging!
-ENABLE_EDITOR_API_LOG=1
-
-!if defined(ENABLE_EDITOR_API_LOG)
-DEFINES = -DENABLE_EDITOR_API_LOG $(DEFINES)
-!endif
-
-!endif
-
-LINCS =                      \
-        -I..\base\public     \
-        -I..\base\src        \
-        -I..\text\src        \
-        $(NULL)
-
-LCFLAGS =            \
-          $(LCFLAGS) \
-          $(DEFINES) \
-          $(NULL)
-
-# These are the base editor libraries we need to link with to create the dll
-
-SUB_LIBRARIES =                          \
-        $(DIST)\lib\libbaseeditor_s.lib  \
-        $(DIST)\lib\libtexteditor_s.lib  \
-        $(NULL)
-
-!if !defined(MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY)
-
-LINCS =               \
-        $(LINCS)      \
-        -I..\html\src \
-        $(NULL)
-
-# These are the html editor libraries we need to link with to create the dll
-
-SUB_LIBRARIES =                          \
-        $(DIST)\lib\libhtmleditor_s.lib  \
-        $(NULL)
-
-!endif
-
-# These are the external libraries we need to link with to create the dll
-
-LLIBS =                                  \
-        $(LLIBS)                         \
-        $(DIST)\lib\xpcom.lib            \
-        $(LIBNSPR)                       \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
+#!nmake
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..
+
+include <$(DEPTH)/config/config.mak>
+
+MODULE       = editor 
+IS_COMPONENT = 1
+
+# Uncomment the line below, or define MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY
+# in your environment, to build only the plain text editor core files:
+# MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY=1
+
+!if defined(MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY)
+
+CPPSRCS =                          \
+          $(CPPSRCS)               \
+          nsTextEditorReg.cpp      \
+          $(NULL)
+
+CPP_OBJS =                                 \
+           $(CPP_OBJS)                     \
+           .\$(OBJDIR)\nsTextEditorReg.obj \
+           $(NULL)
+
+DLLNAME       = texteditor
+
+!else
+
+CPPSRCS =                          \
+          $(CPPSRCS)               \
+          nsEditorRegistration.cpp \
+          $(NULL)
+
+CPP_OBJS =                                      \
+           $(CPP_OBJS)                          \
+           .\$(OBJDIR)\nsEditorRegistration.obj \
+           $(NULL)
+
+#Enable Editor API Logging!
+ENABLE_EDITOR_API_LOG=1
+
+!if defined(ENABLE_EDITOR_API_LOG)
+DEFINES = -DENABLE_EDITOR_API_LOG $(DEFINES)
+!endif
+
+DLLNAME       = editor
+
+!endif
+
+LINCS =               \
+        -I..\base     \
+        -I..\text     \
+        $(NULL)
+
+MAKE_OBJ_TYPE = DLL
+DLL           = .\$(OBJDIR)\$(DLLNAME).dll
+
+LCFLAGS =            \
+          $(LCFLAGS) \
+          $(DEFINES) \
+          $(NULL)
+
+# These are the base editor libraries we need to link with to create the dll
+
+LLIBS =                                  \
+        $(DIST)\lib\libtexteditor_s.lib  \
+        $(DIST)\lib\libbaseeditor_s.lib  \
+        $(NULL)
+
+!if !defined(MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY)
+
+LINCS =           \
+        $(LINCS)  \
+        -I..\html \
+        $(NULL)
+
+# These are the html editor libraries we need to link with to create the dll
+
+LLIBS =                                  \
+        $(DIST)\lib\libhtmleditor_s.lib  \
+        $(LLIBS)                         \
+        $(NULL)
+
+!endif
+
+# These are the external libraries we need to link with to create the dll
+
+LLIBS =                                  \
+        $(LLIBS)                         \
+        $(DIST)\lib\xpcom.lib            \
+        $(DIST)\lib\js3250.lib	\
+        $(DIST)\lib\gkgfx.lib		\
+        $(LIBNSPR)                       \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+build:: $(DLL)
+
+!if !defined(MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY)
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
+	set MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY=1
+	nmake -f makefile.win build
+
+clobber::
+	rm -f $(DIST)\bin\$(DLLNAME).dll
+	rm -f $(DIST)\lib\$(DLLNAME).lib
+
+!endif
diff --git a/editor/libeditor/html/.cvsignore b/editor/libeditor/html/.cvsignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/editor/libeditor/html/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in
index 0b4d2a90ab5..0690964435c 100644
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@@ -26,7 +26,36 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= src
+MODULE		= editor
+LIBRARY_NAME	= htmleditor_s
+# REQUIRES	= xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc
+
+# Building the full blown HTML Editor  so add it's source files and objects:
+
+CPPSRCS  = \
+           nsEditProperty.cpp             \
+           nsHTMLDataTransfer.cpp         \
+           nsHTMLEditor.cpp               \
+           nsHTMLEditorStyle.cpp          \
+           nsHTMLEditRules.cpp            \
+           nsHTMLEditUtils.cpp            \
+           nsTableEditor.cpp              \
+           nsWSRunObject.cpp              \
+           TypeInState.cpp                \
+           TextEditorTest.cpp             \
+           $(NULL)
+
+ifdef ENABLE_EDITOR_API_LOG
+CPPSRCS += nsHTMLEditorLog.cpp             \
+           nsEditorTxnLog.cpp              \
+           $(NULL)
+
+DEFINES += -DENABLE_EDITOR_API_LOG
+endif
+
+# don't want the shared lib; force the creation of a static lib.
+FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+INCLUDES        += -I../base -I../text
diff --git a/editor/libeditor/html/makefile.win b/editor/libeditor/html/makefile.win
index 18931a3eb90..ec20c69e6ed 100644
--- a/editor/libeditor/html/makefile.win
+++ b/editor/libeditor/html/makefile.win
@@ -21,7 +21,85 @@
 
 DEPTH=..\..\..
 
-DIRS= public src
+LIBRARY_NAME=libhtmleditor_s
+
+CPPSRCS =                        \
+          TypeInState.cpp        \
+          nsEditProperty.cpp     \
+          nsHTMLDataTransfer.cpp \
+          nsHTMLEditRules.cpp    \
+          nsHTMLEditUtils.cpp    \
+          nsHTMLEditor.cpp       \
+          nsHTMLEditorStyle.cpp  \
+          nsHTMLURIRefObject.cpp \
+          nsTableEditor.cpp      \
+          nsWSRunObject.cpp      \
+          TextEditorTest.cpp     \
+          $(NULL)
+
+CPP_OBJS =                                    \
+           .\$(OBJDIR)\TypeInState.obj        \
+           .\$(OBJDIR)\nsEditProperty.obj     \
+           .\$(OBJDIR)\nsHTMLDataTransfer.obj \
+           .\$(OBJDIR)\nsHTMLEditRules.obj    \
+           .\$(OBJDIR)\nsHTMLEditUtils.obj    \
+           .\$(OBJDIR)\nsHTMLEditor.obj       \
+           .\$(OBJDIR)\nsHTMLEditorStyle.obj  \
+           .\$(OBJDIR)\nsHTMLURIRefObject.obj \
+           .\$(OBJDIR)\nsTableEditor.obj      \
+           .\$(OBJDIR)\nsWSRunObject.obj      \
+           .\$(OBJDIR)\TextEditorTest.obj     \
+           $(NULL)
+
+
+# Enable Editor API Logging!
+ENABLE_EDITOR_API_LOG=1
+
+!if defined(ENABLE_EDITOR_API_LOG)
+
+CPPSRCS =                     \
+          $(CPPSRCS)          \
+          nsEditorTxnLog.cpp  \
+          nsHTMLEditorLog.cpp \
+          $(NULL)
+
+CPP_OBJS =                                 \
+           $(CPP_OBJS)                     \
+           .\$(OBJDIR)\nsEditorTxnLog.obj  \
+           .\$(OBJDIR)\nsHTMLEditorLog.obj \
+           $(NULL)
+
+DEFINES = -DENABLE_EDITOR_API_LOG $(DEFINES)
+
+!endif
+
+MODULE=editor 
+
+LINCS =             \
+        -I..\base   \
+        -I..\text   \
+        $(NULL)
+
+LCFLAGS =            \
+          $(LCFLAGS) \
+          $(DEFINES) \
+          $(NULL)
+
+# These are the libraries we need to link with to create the dll
+# LLIBS =                                \
+#         $(DIST)\lib\xpcom.lib          \
+#         $(DIST)\lib\js3250.lib         \
+#         $(DIST)\lib\gkparser.lib       \
+#         $(DIST)\lib\raptorwidget_s.lib \
+#         $(DIST)\lib\timer_s.lib        \
+#         $(LIBNSPR)                     \
+#         $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+	rm -f $(PDBFILE).pdb
diff --git a/editor/libeditor/text/.cvsignore b/editor/libeditor/text/.cvsignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/editor/libeditor/text/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in
index 0b4d2a90ab5..b663dd85562 100644
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@@ -26,7 +26,32 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= src
+MODULE		= editor
+LIBRARY_NAME	= texteditor_s
+IS_COMPONENT	= 1
+# REQUIRES	= xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc
+
+CPPSRCS		=                           \
+		nsPlaintextDataTransfer.cpp \
+		nsPlaintextEditor.cpp       \
+		nsTextEditUtils.cpp         \
+		nsTextEditRules.cpp         \
+		nsEditorEventListeners.cpp  \
+		nsWrapUtils.cpp  \
+		nsInternetCiter.cpp  \
+		nsAOLCiter.cpp  \
+		$(NULL)
+
+ifdef IBMBIDI
+CPPSRCS		+= \
+		nsTextEditRulesBidi.cpp \
+		$(NULL)
+endif                
+
+# don't want the shared lib; force the creation of a static lib.
+FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
+INCLUDES        += -I../base
+
diff --git a/editor/libeditor/text/makefile.win b/editor/libeditor/text/makefile.win
index 18931a3eb90..9cb7c153fea 100644
--- a/editor/libeditor/text/makefile.win
+++ b/editor/libeditor/text/makefile.win
@@ -21,7 +21,58 @@
 
 DEPTH=..\..\..
 
-DIRS= public src
+LIBRARY_NAME=libtexteditor_s
+
+CPPSRCS =                             \
+          nsAOLCiter.cpp              \
+          nsEditorEventListeners.cpp  \
+          nsInternetCiter.cpp         \
+          nsPlaintextDataTransfer.cpp \
+          nsPlaintextEditor.cpp       \
+          nsTextEditRules.cpp         \
+          nsTextEditRulesBidi.cpp     \
+          nsTextEditUtils.cpp         \
+          nsWrapUtils.cpp             \
+          $(NULL)
+
+CPP_OBJS =                                         \
+           .\$(OBJDIR)\nsAOLCiter.obj              \
+           .\$(OBJDIR)\nsEditorEventListeners.obj  \
+           .\$(OBJDIR)\nsInternetCiter.obj         \
+           .\$(OBJDIR)\nsPlaintextDataTransfer.obj \
+           .\$(OBJDIR)\nsPlaintextEditor.obj       \
+           .\$(OBJDIR)\nsTextEditRules.obj         \
+           .\$(OBJDIR)\nsTextEditRulesBidi.obj     \
+           .\$(OBJDIR)\nsTextEditUtils.obj         \
+           .\$(OBJDIR)\nsWrapUtils.obj             \
+           $(NULL)
+
+MODULE=editor 
+
+LINCS =                   \
+        -I..\base         \
+        $(NULL)
+
+LCFLAGS =            \
+          $(LCFLAGS) \
+          $(DEFINES) \
+          $(NULL)
+
+# These are the libraries we need to link with to create the dll
+# LLIBS =                                \
+#         $(DIST)\lib\xpcom.lib          \
+#         $(DIST)\lib\js3250.lib         \
+#         $(DIST)\lib\gkparser.lib       \
+#         $(DIST)\lib\raptorwidget_s.lib \
+#         $(DIST)\lib\timer_s.lib        \
+#         $(LIBNSPR)                     \
+#         $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+	rm -f $(PDBFILE).pdb