From bb71dc665701d07dfccca72145d9a918dbc55cad Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Sat, 11 Sep 1999 01:20:05 +0000 Subject: [PATCH] General cleanup. git-svn-id: svn://10.0.0.236/trunk@46910 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/idl/Makefile.in | 16 ++++++++-------- mozilla/editor/txmgr/tests/Makefile.in | 15 +++++++-------- mozilla/editor/ui/composer/content/Makefile.in | 1 + .../editor/ui/composer/locale/en-US/Makefile.in | 1 + mozilla/editor/ui/composer/skin/Makefile.in | 1 + mozilla/editor/ui/dialogs/content/Makefile.in | 1 + .../editor/ui/dialogs/locale/en-US/Makefile.in | 1 + mozilla/editor/ui/dialogs/skin/Makefile.in | 5 ++--- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/mozilla/editor/idl/Makefile.in b/mozilla/editor/idl/Makefile.in index 4afc853868d..73d8761603d 100644 --- 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 + diff --git a/mozilla/editor/txmgr/tests/Makefile.in b/mozilla/editor/txmgr/tests/Makefile.in index fff1d186351..fc3845c56c8 100644 --- 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 diff --git a/mozilla/editor/ui/composer/content/Makefile.in b/mozilla/editor/ui/composer/content/Makefile.in index 19f9c7b2434..9c5a0293ca5 100644 --- 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 + diff --git a/mozilla/editor/ui/composer/locale/en-US/Makefile.in b/mozilla/editor/ui/composer/locale/en-US/Makefile.in index 2dd133855c8..25833d4d0b2 100644 --- 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 + diff --git a/mozilla/editor/ui/composer/skin/Makefile.in b/mozilla/editor/ui/composer/skin/Makefile.in index 5f4f6825e92..f09f40d0afb 100644 --- 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 + diff --git a/mozilla/editor/ui/dialogs/content/Makefile.in b/mozilla/editor/ui/dialogs/content/Makefile.in index 32c092704c7..160d7bc869a 100644 --- 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 + diff --git a/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in b/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in index 4537e659545..7a4d6c1ddab 100644 --- 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 + diff --git a/mozilla/editor/ui/dialogs/skin/Makefile.in b/mozilla/editor/ui/dialogs/skin/Makefile.in index 89a01adafaf..0d6f1aaa3d6 100644 --- 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 +