diff --git a/ChangeLog b/ChangeLog index 1797db068..5e9acebb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-09-24 Adam Fedor + + * Documentation/GNUmakefile.postamble: Clean up files properly + * Source/DocMakefile: Fix up for moved files + * Documentation/Gui/Gui.gsdoc, + Documentation/GuiAdditions/GuiAdditions.gsdoc: Move up one level. + 2004-09-24 Fred Kiefer * Headers/AppKit/NSControl.h @@ -15,7 +22,7 @@ (-dealloc): Unset the menu of the view. (-initWithTitle:): Use setMenuRepresentation: to set the view. -2004-09-24 Adam Fedor +004-09-24 Adam Fedor * Version 0.9.4 diff --git a/Documentation/GNUmakefile.postamble b/Documentation/GNUmakefile.postamble index d794a6f69..45e6ce387 100644 --- a/Documentation/GNUmakefile.postamble +++ b/Documentation/GNUmakefile.postamble @@ -77,6 +77,8 @@ after-uninstall:: # Things to do after cleaning after-clean:: $(MAKE) -C ../Source -f DocMakefile clean + rm -rf Gui + rm -rf GuiAdditions # Things to do before distcleaning # before-distclean:: diff --git a/Documentation/Gui/Gui.gsdoc b/Documentation/Gui.gsdoc similarity index 100% rename from Documentation/Gui/Gui.gsdoc rename to Documentation/Gui.gsdoc diff --git a/Documentation/Gui/NSMutableAttributedStringAdditions.gsdoc b/Documentation/Gui/NSMutableAttributedStringAdditions.gsdoc deleted file mode 100644 index a18f72262..000000000 --- a/Documentation/Gui/NSMutableAttributedStringAdditions.gsdoc +++ /dev/null @@ -1,85 +0,0 @@ - - - - - NSMutableAttributedStringAdditions - - - - - $Revision$ - $Date$ - - - - NSMutableAttributedStringAdditions - - Gui/NSAttributedString.h - - - - applyFontTraits: - mask - range: - aRange - - - - - fixAttachmentAttributeInRange: - aRange - - - - - fixAttributesInRange: - aRange - - - - - fixFontAttributeInRange: - aRange - - - - - fixParagraphStyleAttributeInRange: - aRange - - - - - setAlignment: - alignment - - - - - subscriptRange: - aRange - - - - - superscriptRange: - aRange - - - - - unscriptRange: - aRange - - - - - updateAttachmentsFromPath: - path - - - - - - - diff --git a/Documentation/GuiAdditions/GuiAdditions.gsdoc b/Documentation/GuiAdditions.gsdoc similarity index 100% rename from Documentation/GuiAdditions/GuiAdditions.gsdoc rename to Documentation/GuiAdditions.gsdoc diff --git a/Source/DocMakefile b/Source/DocMakefile index 448620249..c21d5ca73 100644 --- a/Source/DocMakefile +++ b/Source/DocMakefile @@ -27,7 +27,6 @@ MAKEFILE_NAME = DocMakefile include $(GNUSTEP_MAKEFILES)/common.make ADD_THESE_QUESTION_MARK = \ -NSAttributedString.h \ NSColorPicking.h \ NSGraphics.h \ NSNibConnector.h \ @@ -41,6 +40,7 @@ AUTOGSDOC_HEADERS_GUI = \ NSActionCell.h \ NSAffineTransform.h \ NSApplication.h \ +NSAttributedString.h \ NSBezierPath.h \ NSBitmapImageRep.h \ NSBox.h \ @@ -157,12 +157,11 @@ DOCUMENT_NAME = Gui GuiAdditions Gui_DOC_INSTALL_DIR = Developer/Gui/Reference GuiAdditions_DOC_INSTALL_DIR = Developer/Gui/Reference -Gui_AGSDOC_FILES = ../Documentation/Gui/Gui.gsdoc \ - ../Documentation/Gui/NSMutableAttributedStringAdditions.gsdoc \ +Gui_AGSDOC_FILES = ../Documentation/Gui.gsdoc \ $(AUTOGSDOC_HEADERS_GUI) GuiAdditions_AGSDOC_FILES = $(AUTOGSDOC_HEADERS_GUIADD) \ - ../Documentation/GuiAdditions/GuiAdditions.gsdoc + ../Documentation/GuiAdditions.gsdoc # # Hack ... using the -DocumentationDirectory flag overrides the value @@ -205,8 +204,8 @@ include $(GNUSTEP_MAKEFILES)/documentation.make before-all:: ../Documentation/Gui \ ../Documentation/GuiAdditions - cp ../Documentation/Gui/Gui.gsdoc . - cp ../Documentation/GuiAdditions/GuiAdditions.gsdoc . + cp ../Documentation/Gui.gsdoc . + cp ../Documentation/GuiAdditions.gsdoc . ../Documentation/Gui: $(MKDIRS) ../Documentation/Gui @@ -214,7 +213,6 @@ before-all:: ../Documentation/Gui \ ../Documentation/GuiAdditions: $(MKDIRS) ../Documentation/GuiAdditions - # # Clean up temporary files used while generating documentation. #