Minor tidy-ups of makefiles - removed some obsolete code and fixed a few typos

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29557 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2010-02-11 18:21:07 +00:00
parent ebbadfe1e0
commit fba094c591
11 changed files with 26 additions and 21 deletions

View file

@ -1,8 +1,28 @@
2010-02-11 Nicola Pero <nicola.pero@meta-innovation.com>
* Source/GNUmakefile: Do not try including non-existing
* Source/GNUmakefile: Do not try including the non-existing
GNUmakefile.local file.
* ColorPickers/GNUmakefile: Same change.
* Documentation/GNUmakefile: Same change.
* Model/GNUmakefile: Same change.
* Panels/GNUmakefile: Same change.
* PrinterTypes/GNUmakefile: Same change.
* Tools/GNUmakefile: Same change, plus do not try including the
non-existing GNUmakefile.local.service file either.
* Model/GNUmakefile.postamble (after-distclean): Do not remove the
non-existing GNUmakefile.local file.
* Source/GNUmakefile.postamble (after-distclean): Same change.
* Tools/GNUmakefile.postamble (after-distclean): Do not remove the
non-existing GNUmakefile.local and GNUmakefile.local.service
files.
* Documentation/GNUmakefile: Do not include aggregate.make twice.
* KeyBindings/GNUmakefile (after-uninstall): Remove the
$(GNUSTEP_LIBRARY)/KeyBindings directory if empty.
* Model/GNUmakefile: Do not include library.make when GUI_LIB =
gnu.
2010-02-11 Riccardo Mottola <rmottola@users.sf.net>
* Source/NSWindow.m: revert accidental commit

View file

@ -66,8 +66,6 @@ WheelPicker_RESOURCE_FILES = GSWheelColorPicker.tiff
-include GNUmakefile.preamble
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/bundle.make
-include GNUmakefile.postamble

View file

@ -81,9 +81,6 @@ GuiAdditions_DOC_INSTALL_DIR = Developer/Gui/Additions
-include GNUmakefile.preamble
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/aggregate.make
include $(GNUSTEP_MAKEFILES)/aggregate.make
include $(GNUSTEP_MAKEFILES)/documentation.make

View file

@ -34,3 +34,4 @@ after-install:: $(GNUSTEP_LIBRARY)/KeyBindings
after-uninstall::
rm -f $(GNUSTEP_LIBRARY)/KeyBindings/DefaultKeyBindings.dict
-rmdir $(GNUSTEP_LIBRARY)/KeyBindings

View file

@ -85,12 +85,11 @@ libgmodel_BUNDLE_LIBS += $(libgmodel_LIBRARIES_DEPEND_UPON)
nib2gmodel_LIBRARIES_DEPEND_UPON = $(BACKEND_LIBS) $(GUI_LIBS) \
$(FND_LIBS) $(SYSTEM_LIBS)
-include GNUmakefile.local
ifeq ($(GUI_LIB), gnu)
include $(GNUSTEP_MAKEFILES)/bundle.make
else
include $(GNUSTEP_MAKEFILES)/library.make
endif
include $(GNUSTEP_MAKEFILES)/library.make
include $(GNUSTEP_MAKEFILES)/tool.make
include $(GNUSTEP_MAKEFILES)/application.make

View file

@ -32,5 +32,3 @@ before-libgmodel-all:: \
# Additional dependencies
$(GNUSTEP_OBJ_DIR)/GMArchiver.o: GMArchiveObjects.m
after-distclean::
rm -f GNUmakefile.local

View file

@ -33,11 +33,10 @@ LOCALIZED_RESOURCE_COMPONENTS = \
GSDataLinkPanel.gorm \
GSPageLayout.gorm \
GSPrintPanel.gorm \
GSToolbarCustomizationPalette.gorm \
GSToolbarCustomizationPalette.gorm \
GSSpellPanel.gorm
-include GNUmakefile.preamble
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/rules.make

View file

@ -38,7 +38,6 @@ RESOURCE_FILES = GSProlog.ps
-include GNUmakefile.preamble
-include GNUmakefile.local
# We don't actually build anything in this directory so
# just include the common makefile rules
include $(GNUSTEP_MAKEFILES)/rules.make

View file

@ -88,7 +88,6 @@ after-clean::
# Things to do after distcleaning
after-distclean::
rm -f GNUmakefile.local
rm -rf $(GNUSTEP_TARGET_DIR)/config.h
rm -rf ../Headers/Additions/GNUstepGUI/config.h

View file

@ -47,8 +47,6 @@ GSspell_OBJC_FILES = GSspell.m
include GNUmakefile.preamble
-include GNUmakefile.local
ifeq ($(CROSS_COMPILING),yes)
GNUSTEP_MAKE_SERVICES=:
else
@ -59,5 +57,4 @@ include $(GNUSTEP_MAKEFILES)/tool.make
include $(GNUSTEP_MAKEFILES)/service.make
include $(GNUSTEP_MAKEFILES)/aggregate.make
-include GNUmakefile.local.service
include GNUmakefile.postamble

View file

@ -38,9 +38,7 @@
# before-distclean::
# Things to do after distcleaning
after-distclean::
rm -f GNUmakefile.local
rm -f GNUmakefile.local.service
# after-distclean::
# Things to do before checking
# before-check::