General cleanup.

git-svn-id: svn://10.0.0.236/trunk@46910 18797224-902f-48f8-a5cc-f745e15eee43
1999-09-11 01:20:05 +00:00
parent cc0a0b3e69
commit bb71dc6657
8 changed files with 22 additions and 19 deletions
--- a/mozilla/editor/idl/Makefile.in
+++ b/mozilla/editor/idl/Makefile.in
@@ -15,20 +15,20 @@
 # Reserved.
 # 

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

 include $(DEPTH)/config/autoconf.mk

-XPIDLSRCS = nsIEditorShell.idl \
-						nsIEditorSpellCheck.idl  \
-						nsIDocumentStateListener.idl \
-						$(NULL)
+MODULE		= editor

-MODULE	= editor
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+XPIDLSRCS	= \
+		nsIEditorShell.idl \
+		nsIEditorSpellCheck.idl \
+		nsIDocumentStateListener.idl \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk
+
--- a/mozilla/editor/txmgr/tests/Makefile.in
+++ b/mozilla/editor/txmgr/tests/Makefile.in
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -21,15 +22,13 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+PROGRAM		= TestTXMgr
+
 CPPSRCS		= TestTXMgr.cpp

+LIBS		= -lxpcom $(NSPR_LIBS)
+
+include $(topsrcdir)/config/rules.mk
+
 INCLUDES	+= -I$(DIST)/include

-LIBS		= \
-		  -lxpcom \
-		  $(NSPR_LIBS) \
-		  $(NULL)
-
-PROGRAM		= TestTXMgr
-
-include $(topsrcdir)/config/rules.mk
--- a/mozilla/editor/ui/composer/content/Makefile.in
+++ b/mozilla/editor/ui/composer/content/Makefile.in
@@ -53,3 +53,4 @@ include $(topsrcdir)/config/rules.mk

 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/content/default
+
--- a/mozilla/editor/ui/composer/locale/en-US/Makefile.in
+++ b/mozilla/editor/ui/composer/locale/en-US/Makefile.in
@@ -37,3 +37,4 @@ include $(topsrcdir)/config/rules.mk

 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/locale/en-US
+
--- a/mozilla/editor/ui/composer/skin/Makefile.in
+++ b/mozilla/editor/ui/composer/skin/Makefile.in
@@ -72,3 +72,4 @@ include $(topsrcdir)/config/rules.mk
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_SKIN) $(DIST)/bin/chrome/editor/skin/default
 	$(INSTALL) $(EXPORT_RESOURCE_TOOLBAR) $(DIST)/bin/chrome/editor/skin/default/images
+
--- a/mozilla/editor/ui/dialogs/content/Makefile.in
+++ b/mozilla/editor/ui/dialogs/content/Makefile.in
@@ -53,3 +53,4 @@ include $(topsrcdir)/config/rules.mk

 install::
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/content/default
+
--- a/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in
+++ b/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in
@@ -40,3 +40,4 @@ include $(topsrcdir)/config/rules.mk

 install::
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/locale/en-US
+
--- a/mozilla/editor/ui/dialogs/skin/Makefile.in
+++ b/mozilla/editor/ui/dialogs/skin/Makefile.in
@@ -22,9 +22,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXPORT_RESOURCE_SKIN = $(srcdir)/EditorDialog.css
-
 include $(topsrcdir)/config/rules.mk

 install:: 
-	$(INSTALL) $(EXPORT_RESOURCE_SKIN) $(DIST)/bin/chrome/editor/skin/default
+	$(INSTALL) $(srcdir)/EditorDialog.css $(DIST)/bin/chrome/editor/skin/default
+