From 354d866a47541866f310d3d32fe6b40c44e6e63a Mon Sep 17 00:00:00 2001 From: "brade%netscape.com" Date: Mon, 8 May 2000 15:00:39 +0000 Subject: [PATCH] bug #34416; tested by axel@pike.org (Thanks!) git-svn-id: svn://10.0.0.236/trunk@68675 18797224-902f-48f8-a5cc-f745e15eee43 --- .../editor/ui/composer/content/Makefile.in | 52 +++--- .../ui/composer/locale/en-US/Makefile.in | 22 +-- mozilla/editor/ui/composer/skin/Makefile.in | 157 +----------------- mozilla/editor/ui/dialogs/content/Makefile.in | 86 +++++----- .../ui/dialogs/locale/en-US/Makefile.in | 42 ++--- mozilla/editor/ui/dialogs/skin/Makefile.in | 31 +--- 6 files changed, 117 insertions(+), 273 deletions(-) diff --git a/mozilla/editor/ui/composer/content/Makefile.in b/mozilla/editor/ui/composer/content/Makefile.in index abf87c2db86..7ffe2dad64e 100644 --- a/mozilla/editor/ui/composer/content/Makefile.in +++ b/mozilla/editor/ui/composer/content/Makefile.in @@ -27,33 +27,33 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/editor.xul \ - $(srcdir)/EditorCommands.js \ - $(srcdir)/ComposerCommands.js \ - $(srcdir)/EditorCommandsDebug.js \ - $(srcdir)/TextEditorAppShell.xul \ - $(srcdir)/EditorInitPage.html \ - $(srcdir)/EditorInitPagePlain.html \ - $(srcdir)/EditorStyles1.css \ - $(srcdir)/EditorContent.css \ - $(srcdir)/EditorAllTags.css \ - $(srcdir)/EditorOverride.css \ - $(srcdir)/EditorParagraphMarks.css \ - $(srcdir)/sidebar-editor.rdf \ - $(srcdir)/sidebar-editor.xul \ - $(srcdir)/sb-bookmarks-panel.xul \ - $(srcdir)/sb-bookmarks.js \ - $(srcdir)/sb-file-contextMenu.js \ - $(srcdir)/sb-file-panel.js \ - $(srcdir)/sb-file-panel.xul \ - $(srcdir)/sb-FileWidgetFileHandler.js \ - $(srcdir)/editorOverlay.xul \ - $(srcdir)/editorOverlay.js \ +CHROME_DIR = editor +CHROME_CONTENT_DIR = content + +CHROME_CONTENT = \ + editor.xul \ + EditorCommands.js \ + ComposerCommands.js \ + EditorCommandsDebug.js \ + TextEditorAppShell.xul \ + EditorInitPage.html \ + EditorInitPagePlain.html \ + EditorStyles1.css \ + EditorContent.css \ + EditorAllTags.css \ + EditorOverride.css \ + EditorParagraphMarks.css \ + sidebar-editor.rdf \ + sidebar-editor.xul \ + sb-bookmarks-panel.xul \ + sb-bookmarks.js \ + sb-file-contextMenu.js \ + sb-file-panel.js \ + sb-file-panel.xul \ + sb-FileWidgetFileHandler.js \ + editorOverlay.xul \ + editorOverlay.js \ $(NULL) include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/content - diff --git a/mozilla/editor/ui/composer/locale/en-US/Makefile.in b/mozilla/editor/ui/composer/locale/en-US/Makefile.in index 082f085bf15..b0e36a8de06 100644 --- a/mozilla/editor/ui/composer/locale/en-US/Makefile.in +++ b/mozilla/editor/ui/composer/locale/en-US/Makefile.in @@ -13,7 +13,7 @@ # # The Initial Developer of the Original Code is Netscape # Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998-1999 Netscape Communications Corporation. All +# Copyright (C) 1998-2000 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): @@ -27,17 +27,17 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/editor.dtd \ - $(srcdir)/sidebar-editor-rdf.dtd \ - $(srcdir)/sidebar-editor.dtd \ - $(srcdir)/viewSource.dtd \ - $(srcdir)/editorOverlay.dtd \ - $(srcdir)/editor.properties \ +CHROME_DIR = editor +CHROME_L10N_DIR = locale + +CHROME_L10N = \ + editor.dtd \ + sidebar-editor-rdf.dtd \ + sidebar-editor.dtd \ + viewSource.dtd \ + editorOverlay.dtd \ + editor.properties \ $(NULL) include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/locale - diff --git a/mozilla/editor/ui/composer/skin/Makefile.in b/mozilla/editor/ui/composer/skin/Makefile.in index d7ce9e49d23..5ed9ec77398 100644 --- a/mozilla/editor/ui/composer/skin/Makefile.in +++ b/mozilla/editor/ui/composer/skin/Makefile.in @@ -26,157 +26,14 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_SKIN = \ - $(srcdir)/editor.css \ - $(srcdir)/EditorToolbars.css \ - $(NULL) +DIRS = images -EXPORT_RESOURCE_TOOLBAR = \ - $(srcdir)/images/bold.gif \ - $(srcdir)/images/bullets.gif \ - $(srcdir)/images/left.gif \ - $(srcdir)/images/center.gif \ - $(srcdir)/images/right.gif \ - $(srcdir)/images/justify.gif \ - $(srcdir)/images/outdent.gif \ - $(srcdir)/images/find.gif \ - $(srcdir)/images/hline.gif \ - $(srcdir)/images/hover-teal.gif \ - $(srcdir)/images/image.gif \ - $(srcdir)/images/indent.gif \ - $(srcdir)/images/italic.gif \ - $(srcdir)/images/link.gif \ - $(srcdir)/images/numbers.gif \ - $(srcdir)/images/spell.gif \ - $(srcdir)/images/table.gif \ - $(srcdir)/images/anchor.gif \ - $(srcdir)/images/anchor-in-doc.gif \ - $(srcdir)/images/div.gif \ - $(srcdir)/images/span.gif \ - $(srcdir)/images/underline.gif \ - $(srcdir)/images/color.gif \ - $(srcdir)/images/align.gif \ - $(srcdir)/images/object-popup.gif \ - $(srcdir)/images/newfile.gif \ - $(srcdir)/images/openfile.gif \ - $(srcdir)/images/savefile.gif \ - $(srcdir)/images/savemod.gif \ - $(srcdir)/images/publish.gif \ - $(srcdir)/images/preview.gif \ - $(srcdir)/images/print.gif \ - $(srcdir)/images/find.gif \ - $(srcdir)/images/img-align-bottom.gif \ - $(srcdir)/images/img-align-left.gif \ - $(srcdir)/images/img-align-middle.gif \ - $(srcdir)/images/img-align-right.gif \ - $(srcdir)/images/img-align-top.gif \ - $(srcdir)/images/link-white.gif \ - $(srcdir)/images/anchor-white.gif \ - $(srcdir)/images/image-white.gif \ - $(srcdir)/images/table-white.gif \ - $(srcdir)/images/hline-white.gif \ - $(srcdir)/images/dec-font-size.gif \ - $(srcdir)/images/inc-font-size.gif \ - $(srcdir)/images/tag-abr.gif \ - $(srcdir)/images/tag-acr.gif \ - $(srcdir)/images/tag-adr.gif \ - $(srcdir)/images/tag-ara.gif \ - $(srcdir)/images/tag-bas.gif \ - $(srcdir)/images/tag-blq.gif \ - $(srcdir)/images/tag-bsf.gif \ - $(srcdir)/images/tag-btn.gif \ - $(srcdir)/images/tag-cit.gif \ - $(srcdir)/images/tag-clg.gif \ - $(srcdir)/images/tag-cod.gif \ - $(srcdir)/images/tag-cpt.gif \ - $(srcdir)/images/tag-ctr.gif \ - $(srcdir)/images/tag-fld.gif \ - $(srcdir)/images/tag-fnt.gif \ - $(srcdir)/images/tag-for.gif \ - $(srcdir)/images/tag-frm.gif \ - $(srcdir)/images/tag-fst.gif \ - $(srcdir)/images/tag-ifr.gif \ - $(srcdir)/images/tag-inp.gif \ - $(srcdir)/images/tag-lbl.gif \ - $(srcdir)/images/tag-lgn.gif \ - $(srcdir)/images/tag-lnk.gif \ - $(srcdir)/images/tag-lst.gif \ - $(srcdir)/images/tag-men.gif \ - $(srcdir)/images/tag-nfr.gif \ - $(srcdir)/images/tag-nsc.gif \ - $(srcdir)/images/tag-opg.gif \ - $(srcdir)/images/tag-opt.gif \ - $(srcdir)/images/tag-prm.gif \ - $(srcdir)/images/tag-scr.gif \ - $(srcdir)/images/tag-slc.gif \ - $(srcdir)/images/tag-sml.gif \ - $(srcdir)/images/tag-smp.gif \ - $(srcdir)/images/tag-spn.gif \ - $(srcdir)/images/tag-stk.gif \ - $(srcdir)/images/tag-stl.gif \ - $(srcdir)/images/tag-stn.gif \ - $(srcdir)/images/tag-tbd.gif \ - $(srcdir)/images/tag-tbl.gif \ - $(srcdir)/images/tag-tft.gif \ - $(srcdir)/images/tag-thd.gif \ - $(srcdir)/images/tag-hed.gif \ - $(srcdir)/images/tag-isx.gif \ - $(srcdir)/images/tag-met.gif \ - $(srcdir)/images/tag-ttl.gif \ - $(srcdir)/images/tag-pln.gif \ - $(srcdir)/images/tag-xmp.gif \ - $(srcdir)/images/tag-txt.gif \ - $(srcdir)/images/tag-unknown.gif \ - $(srcdir)/images/tag-a.gif \ - $(srcdir)/images/tag-app.gif \ - $(srcdir)/images/tag-b.gif \ - $(srcdir)/images/tag-bdo.gif \ - $(srcdir)/images/tag-big.gif \ - $(srcdir)/images/tag-body.gif \ - $(srcdir)/images/tag-br.gif \ - $(srcdir)/images/tag-col.gif \ - $(srcdir)/images/tag-dd.gif \ - $(srcdir)/images/tag-del.gif \ - $(srcdir)/images/tag-dfn.gif \ - $(srcdir)/images/tag-dir.gif \ - $(srcdir)/images/tag-div.gif \ - $(srcdir)/images/tag-dl.gif \ - $(srcdir)/images/tag-dt.gif \ - $(srcdir)/images/tag-em.gif \ - $(srcdir)/images/tag-h1.gif \ - $(srcdir)/images/tag-h2.gif \ - $(srcdir)/images/tag-h3.gif \ - $(srcdir)/images/tag-h4.gif \ - $(srcdir)/images/tag-h5.gif \ - $(srcdir)/images/tag-h6.gif \ - $(srcdir)/images/tag-hr.gif \ - $(srcdir)/images/tag-html.gif \ - $(srcdir)/images/tag-i.gif \ - $(srcdir)/images/tag-img.gif \ - $(srcdir)/images/tag-ins.gif \ - $(srcdir)/images/tag-kbd.gif \ - $(srcdir)/images/tag-li.gif \ - $(srcdir)/images/tag-map.gif \ - $(srcdir)/images/tag-obj.gif \ - $(srcdir)/images/tag-ol.gif \ - $(srcdir)/images/tag-p.gif \ - $(srcdir)/images/tag-pre.gif \ - $(srcdir)/images/tag-q.gif \ - $(srcdir)/images/tag-s.gif \ - $(srcdir)/images/tag-sub.gif \ - $(srcdir)/images/tag-sup.gif \ - $(srcdir)/images/tag-td.gif \ - $(srcdir)/images/tag-th.gif \ - $(srcdir)/images/tag-tr.gif \ - $(srcdir)/images/tag-tt.gif \ - $(srcdir)/images/tag-u.gif \ - $(srcdir)/images/tag-ul.gif \ - $(srcdir)/images/tag-var.gif \ +CHROME_DIR = editor +CHROME_SKIN_DIR = skin + +CHROME_SKIN = \ + editor.css \ + EditorToolbars.css \ $(NULL) include $(topsrcdir)/config/rules.mk - -install:: - $(INSTALL) $(EXPORT_RESOURCE_SKIN) $(DIST)/bin/chrome/editor/skin - $(INSTALL) $(EXPORT_RESOURCE_TOOLBAR) $(DIST)/bin/chrome/editor/skin/images - diff --git a/mozilla/editor/ui/dialogs/content/Makefile.in b/mozilla/editor/ui/dialogs/content/Makefile.in index ab4dfbbf138..8f92cd736a9 100644 --- a/mozilla/editor/ui/dialogs/content/Makefile.in +++ b/mozilla/editor/ui/dialogs/content/Makefile.in @@ -26,50 +26,50 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/EdDialogCommon.js \ - $(srcdir)/EdLinkProps.xul \ - $(srcdir)/EdLinkProps.js \ - $(srcdir)/EdListProps.xul \ - $(srcdir)/EdListProps.js \ - $(srcdir)/EdPageProps.xul \ - $(srcdir)/EdPageProps.js \ - $(srcdir)/EdColorProps.xul \ - $(srcdir)/EdColorProps.js \ - $(srcdir)/EdImageProps.xul \ - $(srcdir)/EdImageProps.js \ - $(srcdir)/EdInsSrc.xul \ - $(srcdir)/EdInsSrc.js \ - $(srcdir)/EdInsertChars.xul \ - $(srcdir)/EdInsertChars.js \ - $(srcdir)/EdHLineProps.xul \ - $(srcdir)/EdHLineProps.js \ - $(srcdir)/EdSpellCheck.xul \ - $(srcdir)/EdSpellCheck.js \ - $(srcdir)/EdDictionary.xul \ - $(srcdir)/EdDictionary.js \ - $(srcdir)/EdNamedAnchorProps.xul \ - $(srcdir)/EdNamedAnchorProps.js \ - $(srcdir)/EdInsertTable.xul \ - $(srcdir)/EdInsertTable.js \ - $(srcdir)/EdTableProps.xul \ - $(srcdir)/EdTableProps.js \ - $(srcdir)/EdDialogOverlay.xul \ - $(srcdir)/EdAdvancedEdit.xul \ - $(srcdir)/EdAdvancedEdit.js \ - $(srcdir)/EdAECSSAttributes.js \ - $(srcdir)/EdAEHTMLAttributes.js \ - $(srcdir)/EdAEJSEAttributes.js \ - $(srcdir)/EdImageMap.js \ - $(srcdir)/EdImageMap.xul \ - $(srcdir)/EdImageMapHotSpot.js \ - $(srcdir)/EdImageMapHotSpot.xul \ - $(srcdir)/EdImageMapShapes.js \ - $(srcdir)/EdImageMapPage.html \ +CHROME_DIR = editor +CHROME_CONTENT_DIR = content + +CHROME_CONTENT = \ + EdDialogCommon.js \ + EdLinkProps.xul \ + EdLinkProps.js \ + EdListProps.xul \ + EdListProps.js \ + EdPageProps.xul \ + EdPageProps.js \ + EdColorProps.xul \ + EdColorProps.js \ + EdImageProps.xul \ + EdImageProps.js \ + EdInsSrc.xul \ + EdInsSrc.js \ + EdInsertChars.xul \ + EdInsertChars.js \ + EdHLineProps.xul \ + EdHLineProps.js \ + EdSpellCheck.xul \ + EdSpellCheck.js \ + EdDictionary.xul \ + EdDictionary.js \ + EdNamedAnchorProps.xul \ + EdNamedAnchorProps.js \ + EdInsertTable.xul \ + EdInsertTable.js \ + EdTableProps.xul \ + EdTableProps.js \ + EdDialogOverlay.xul \ + EdAdvancedEdit.xul \ + EdAdvancedEdit.js \ + EdAECSSAttributes.js \ + EdAEHTMLAttributes.js \ + EdAEJSEAttributes.js \ + EdImageMap.js \ + EdImageMap.xul \ + EdImageMapHotSpot.js \ + EdImageMapHotSpot.xul \ + EdImageMapShapes.js \ + EdImageMapPage.html \ $(NULL) include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/content - diff --git a/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in b/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in index f0ebd1dfe7f..4e4737531ba 100644 --- a/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in +++ b/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in @@ -26,28 +26,28 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ - $(srcdir)/EditorHLineProperties.dtd \ - $(srcdir)/EditorImageProperties.dtd \ - $(srcdir)/EditorInsertSource.dtd \ - $(srcdir)/EditorInsertChars.dtd \ - $(srcdir)/EditorInsertTable.dtd \ - $(srcdir)/EditorLinkProperties.dtd \ - $(srcdir)/EditorListProperties.dtd \ - $(srcdir)/EditorPageProperties.dtd \ - $(srcdir)/EditorColorProperties.dtd \ - $(srcdir)/EditorPersonalDictionary.dtd \ - $(srcdir)/EditorSpellCheck.dtd \ - $(srcdir)/EditorTableProperties.dtd \ - $(srcdir)/EdNamedAnchorProperties.dtd \ - $(srcdir)/EdDialogOverlay.dtd \ - $(srcdir)/EdAdvancedEdit.dtd \ - $(srcdir)/EditorImageMap.dtd \ - $(srcdir)/EditorImageMapHotSpot.dtd \ +CHROME_DIR = editor +CHROME_L10N_DIR = locale + +CHROME_L10N = \ + EditorHLineProperties.dtd \ + EditorImageProperties.dtd \ + EditorInsertSource.dtd \ + EditorInsertChars.dtd \ + EditorInsertTable.dtd \ + EditorLinkProperties.dtd \ + EditorListProperties.dtd \ + EditorPageProperties.dtd \ + EditorColorProperties.dtd \ + EditorPersonalDictionary.dtd \ + EditorSpellCheck.dtd \ + EditorTableProperties.dtd \ + EdNamedAnchorProperties.dtd \ + EdDialogOverlay.dtd \ + EdAdvancedEdit.dtd \ + EditorImageMap.dtd \ + EditorImageMapHotSpot.dtd \ $(NULL) include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/editor/locale - diff --git a/mozilla/editor/ui/dialogs/skin/Makefile.in b/mozilla/editor/ui/dialogs/skin/Makefile.in index 7e0176f41c0..2435dac5fed 100644 --- a/mozilla/editor/ui/dialogs/skin/Makefile.in +++ b/mozilla/editor/ui/dialogs/skin/Makefile.in @@ -13,7 +13,7 @@ # # The Initial Developer of the Original Code is Netscape # Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998-1999 Netscape Communications Corporation. All +# Copyright (C) 1998-2000 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): @@ -26,29 +26,16 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_SKIN = \ - $(srcdir)/EditorDialog.css \ - $(srcdir)/EdImageMap.css \ - $(srcdir)/EdImageMapPage.css \ - $(NULL) +DIRS = images -EXPORT_RESOURCE_IMAGES = \ - $(srcdir)/images/Map_checker.gif \ - $(srcdir)/images/Map_circleTool.gif \ - $(srcdir)/images/Map_contrast.gif \ - $(srcdir)/images/Map_Copy.gif \ - $(srcdir)/images/Map_Cut.gif \ - $(srcdir)/images/Map_Paste.gif \ - $(srcdir)/images/Map_pointerTool.gif \ - $(srcdir)/images/Map_polygonTool.gif \ - $(srcdir)/images/Map_rectangleTool.gif \ - $(srcdir)/images/Map_zoomIn.gif \ - $(srcdir)/images/Map_zoomOut.gif \ +CHROME_DIR = editor +CHROME_SKIN_DIR = skin + +CHROME_SKIN = \ + EditorDialog.css \ + EdImageMap.css \ + EdImageMapPage.css \ $(NULL) include $(topsrcdir)/config/rules.mk -install:: - $(INSTALL) $(EXPORT_RESOURCE_SKIN) $(DIST)/bin/chrome/editor/skin - $(INSTALL) $(EXPORT_RESOURCE_IMAGES) $(DIST)/bin/chrome/editor/skin/images -