General cleanup.

1999-09-09 03:34:19 +00:00 · 1999-09-09 03:34:19 +00:00 · d4bdb95d66
--- a/editor/Makefile.in
+++ b/editor/Makefile.in
@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@ -14,22 +13,22 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ..
+DEPTH		= ..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public idl
+DIRS		= public idl

 ifdef MOZ_EDITOR
-DIRS += base ui
+DIRS		+= base ui
 endif

-DIRS += txmgr txtsvc
-
-include $(topsrcdir)/config/config.mk
+DIRS		+= txmgr txtsvc

 include $(topsrcdir)/config/rules.mk
+
--- a/editor/base/Makefile.in
+++ b/editor/base/Makefile.in
@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@ -14,70 +13,63 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME = ender
-IS_COMPONENT =  1
+MODULE		= editor
+LIBRARY_NAME	= ender
+IS_COMPONENT	= 1

-CPPSRCS =                       \
-    nsEditor.cpp                \
-    nsEditorUtils.cpp           \
-    nsEditorRegistration.cpp    \
-    nsTextEditRules.cpp         \
-    TextEditorTest.cpp          \
-    nsHTMLEditRules.cpp         \
-    nsEditorEventListeners.cpp  \
-    nsEditProperty.cpp          \
-    nsEditorFactory.cpp         \
-    nsHTMLEditor.cpp            \
-    ChangeAttributeTxn.cpp      \
-    EditTxn.cpp                 \
-    EditAggregateTxn.cpp        \
-    EditTable.cpp               \
-    InsertTextTxn.cpp           \
-    PlaceholderTxn.cpp          \
-    DeleteTextTxn.cpp           \
-    CreateElementTxn.cpp        \
-    InsertElementTxn.cpp        \
-    DeleteElementTxn.cpp        \
-    DeleteRangeTxn.cpp          \
-    SplitElementTxn.cpp         \
-    JoinElementTxn.cpp          \
-    nsStyleSheetTxns.cpp        \
-    TransactionFactory.cpp      \
-    TypeInState.cpp             \
-    nsInternetCiter.cpp         \
-    nsAOLCiter.cpp              \
-    nsInterfaceState.cpp        \
-    nsEditorShell.cpp           \
-    nsEditorShellFactory.cpp    \
-    IMETextTxn.cpp              \
-    IMECommitTxn.cpp            \
-    $(NULL)
+CPPSRCS		= \
+		nsEditor.cpp \
+		nsEditorUtils.cpp \
+		nsEditorRegistration.cpp \
+		nsTextEditRules.cpp \
+		TextEditorTest.cpp \
+		nsHTMLEditRules.cpp \
+		nsEditorEventListeners.cpp \
+		nsEditProperty.cpp \
+		nsEditorFactory.cpp \
+		nsHTMLEditor.cpp \
+		ChangeAttributeTxn.cpp \
+		EditTxn.cpp \
+		EditAggregateTxn.cpp \
+		EditTable.cpp \
+		InsertTextTxn.cpp \
+		PlaceholderTxn.cpp \
+		DeleteTextTxn.cpp \
+		CreateElementTxn.cpp \
+		InsertElementTxn.cpp \
+		DeleteElementTxn.cpp \
+		DeleteRangeTxn.cpp \
+		SplitElementTxn.cpp \
+		JoinElementTxn.cpp \
+		nsStyleSheetTxns.cpp \
+		TransactionFactory.cpp \
+		TypeInState.cpp \
+		nsInternetCiter.cpp \
+		nsAOLCiter.cpp \
+		nsInterfaceState.cpp \
+		nsEditorShell.cpp \
+		nsEditorShellFactory.cpp \
+		IMETextTxn.cpp \
+		IMECommitTxn.cpp \
+		nsHTMLEditorLog.cpp \
+		nsEditorTxnLog.cpp \
+		$(NULL)

-# Enable Editor API Logging!
-ENABLE_EDITOR_API_LOG = 1
-
-ifdef ENABLE_EDITOR_API_LOG
-DEFINES += -DENABLE_EDITOR_API_LOG
-CPPSRCS +=              \
-    nsHTMLEditorLog.cpp \
-    nsEditorTxnLog.cpp  \
-    $(NULL)
-endif
-
-MODULE = editor
-
-EXTRA_DSO_LDOPTS =\
-				-L$(DIST)/lib \
-				-lneckoutil_s \
-				$(NULL)
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/lib \
+		-lneckoutil_s \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

+DEFINES		+= -DENABLE_EDITOR_API_LOG
+
--- a/editor/public/Makefile.in
+++ b/editor/public/Makefile.in
@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@ -14,31 +13,31 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXPORTS =		                         \
-    nsIEditActionListener.h	         \
-    nsIEditor.h	                     \
-    nsEditorCID.h	                   \
-    nsICiter.h	                     \
-    nsIEditorIMESupport.h            \
-    nsIEditorLogging.h               \
-    nsIEditorMailSupport.h           \
-    nsIEditorStyleSheets.h           \
-    nsIHTMLEditor.h                  \
-    nsITableEditor.h                 \
-    $(NULL)
+MODULE		= editor

-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		= \
+		nsIEditActionListener.h \
+		nsIEditor.h \
+		nsEditorCID.h \
+		nsICiter.h \
+		nsIEditorIMESupport.h \
+		nsIEditorLogging.h \
+		nsIEditorMailSupport.h \
+		nsIEditorStyleSheets.h \
+		nsIHTMLEditor.h \
+		nsITableEditor.h \
+		$(NULL)

-MODULE = editor
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/editor/txmgr/Makefile.in
+++ b/editor/txmgr/Makefile.in
@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@ -14,20 +13,20 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public src
+DIRS		= public src

 ifdef ENABLE_TESTS
-DIRS += tests
+DIRS		+= tests
 endif

-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
+
--- a/editor/txmgr/public/Makefile.in
+++ b/editor/txmgr/public/Makefile.in
@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@ -14,25 +13,25 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXPORTS =						\
-    nsITransaction.h			\
-    nsITransactionListener.h	\
-    nsITransactionManager.h		\
-    nsTransactionManagerCID.h	\
-    $(NULL)
+MODULE		= txmgr

-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		= \
+		nsITransaction.h \
+		nsITransactionListener.h \
+		nsITransactionManager.h \
+		nsTransactionManagerCID.h \
+		$(NULL)

-MODULE = txmgr
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@ -14,39 +13,32 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../..
-
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME = txmgr
-IS_COMPONENT = 1
+MODULE		= txmgr
+LIBRARY_NAME	= txmgr
+IS_COMPONENT	= 1

-CPPSRCS =                           \
-    nsTransactionItem.cpp           \
-    nsTransactionManager.cpp        \
-    nsTransactionManagerFactory.cpp \
-    nsTransactionStack.cpp          \
-    $(NULL)
+REQUIRES	= xpcom
+
+CPPSRCS		= \
+		nsTransactionItem.cpp \
+		nsTransactionManager.cpp \
+		nsTransactionManagerFactory.cpp \
+		nsTransactionStack.cpp \
+		$(NULL)

 EXTRA_DSO_LDOPTS = \
-    -L$(DIST)/lib  \
-    -lxpcom   \
-    $(NULL)
-
-MODULE = txmgr
-
-REQUIRES = xpcom
-
-include $(topsrcdir)/config/config.mk
-
-TARGET = $(LIBARY)
+		-L$(DIST)/lib \
+		-lxpcom \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

-test:
-	@echo OS_ARCH = $(OS_ARCH)
--- a/editor/txtsvc/Makefile.in
+++ b/editor/txtsvc/Makefile.in
@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@ -14,20 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public src
-
-# ifdef ENABLE_TESTS
-# DIRS += tests
-# endif
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src

 include $(topsrcdir)/config/rules.mk
+
--- a/editor/txtsvc/public/Makefile.in
+++ b/editor/txtsvc/public/Makefile.in
@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@ -14,25 +13,25 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXPORTS =						\
-    nsISpellChecker.h			\
-    nsITextService.h			\
-    nsITextServicesDocument.h	        \
-    nsTextServicesCID.h			\
-    $(NULL)
+MODULE		= txtsvc

-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		= \
+		nsISpellChecker.h \
+		nsITextService.h \
+		nsITextServicesDocument.h \
+		nsTextServicesCID.h \
+		$(NULL)

-MODULE = txtsvc
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@ -14,38 +13,31 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../..
-
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME = txtsvc
-IS_COMPONENT = 1
+MODULE		= txtsvc
+LIBRARY_NAME	= txtsvc
+IS_COMPONENT	= 1

-CPPSRCS =                      \
-    nsTextServicesDocument.cpp \
-    nsTextServicesFactory.cpp  \
-    nsTSDNotifier.cpp  \
-    $(NULL)
+REQUIRES	= xpcom
+
+CPPSRCS		= \
+		nsTextServicesDocument.cpp \
+		nsTextServicesFactory.cpp \
+		nsTSDNotifier.cpp \
+		$(NULL)

 EXTRA_DSO_LDOPTS = \
-    -L$(DIST)/lib  \
-    -lxpcom   \
-    $(NULL)
-
-MODULE = txtsvc
-
-REQUIRES = xpcom
-
-include $(topsrcdir)/config/config.mk
-
-TARGET = $(LIBARY)
+		-L$(DIST)/lib \
+		-lxpcom \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

-test:
-	@echo OS_ARCH = $(OS_ARCH)
--- a/editor/ui/Makefile.in
+++ b/editor/ui/Makefile.in
@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = composer dialogs
-
-include $(topsrcdir)/config/config.mk
+DIRS		= composer dialogs

 include $(topsrcdir)/config/rules.mk
+