diff --git a/ChangeLog b/ChangeLog index d43374648..44eb1f7b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,14 @@ two libraries that are built on top of it. This will prevent problems when libraries from the same GNUmakefile are built in parallel. - (GNUmakefile.local): Do not try including this non-existing file. + + * Source/GNUmakefile (GNUmakefile.local): Do not try including + this non-existing file. + * Examples/GNUmakefile: Same change. + * NSTimeZones/GNUmakefile: Same change. + * Resources/GNUmakefile: Same change. + * SSL/GNUmakefile: Same change. + * Tools/GNUmakefile: Same change. 2010-02-11 07:37-EST Gregory John Casamento diff --git a/Examples/GNUmakefile b/Examples/GNUmakefile index 510492988..c76181288 100644 --- a/Examples/GNUmakefile +++ b/Examples/GNUmakefile @@ -61,8 +61,6 @@ nsconnection_server_OBJC_FILES = nsconnection_server.m include Makefile.preamble --include GNUmakefile.local - include $(GNUSTEP_MAKEFILES)/test-tool.make include Makefile.postamble diff --git a/NSTimeZones/GNUmakefile b/NSTimeZones/GNUmakefile index b9f69a522..b23b28d45 100644 --- a/NSTimeZones/GNUmakefile +++ b/NSTimeZones/GNUmakefile @@ -56,8 +56,6 @@ NSTimeZones.tar -include Makefile.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 diff --git a/Resources/GNUmakefile b/Resources/GNUmakefile index 5681cd673..1b7ff5fa7 100644 --- a/Resources/GNUmakefile +++ b/Resources/GNUmakefile @@ -75,8 +75,6 @@ Languages/Korean LANGUAGE_INSTALL_FILES = $(LANGUAGE_FILES) Languages/Locale.aliases \ Languages/Locale.encodings --include GNUmakefile.local - include $(GNUSTEP_MAKEFILES)/resource-set.make -include GNUmakefile.postamble diff --git a/SSL/GNUmakefile b/SSL/GNUmakefile index f4595a336..e8a081044 100644 --- a/SSL/GNUmakefile +++ b/SSL/GNUmakefile @@ -83,8 +83,6 @@ endif -include Makefile.preamble --include GNUmakefile.local - include $(GNUSTEP_MAKEFILES)/bundle.make -include Makefile.postamble diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index 4ba44fc45..82beefb7d 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -113,8 +113,6 @@ AUTOGSDOC=./$(GNUSTEP_OBJ_DIR_NAME)/autogsdoc include Makefile.preamble --include GNUmakefile.local - include $(GNUSTEP_MAKEFILES)/tool.make include $(GNUSTEP_MAKEFILES)/ctool.make include $(GNUSTEP_MAKEFILES)/aggregate.make