Makefile fix ups.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3361 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1998-12-01 14:41:53 +00:00
parent 0c4d973115
commit a1a2f7685c
5 changed files with 12 additions and 3 deletions

View file

@ -1,3 +1,8 @@
Tue Dec 1 09:58:20 1998 Adam Fedor <fedor@ultra.doc.com>
* Source/NSWorkspace.m ([NSWorkspace -findApplications]): Check
for data before calling deserializer.
Tue Dec 1 10:25:00 1998 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* NSApplication.m: Fixed auto-enable of services menu.

View file

@ -201,7 +201,6 @@ AppKit/TrackingRectangle.h \
AppKit/PSMatrix.h \
AppKit/nsimage-tiff.h \
-include GNUmakefile.preamble
-include GNUmakefile.local

View file

@ -1033,7 +1033,7 @@ andOptionTranslation:(NSString *)optionTranslation
[self loadPPD:PPDstring inclusionNum:0];
// Search the PPD dictionary for symbolvalues, and substitute them.
objEnum = [PPD objectEnumerator];
while (valArray = [objEnum nextObject])
while ((valArray = [objEnum nextObject]))
{
NSString *oldValue;
NSString *newValue;

View file

@ -328,8 +328,12 @@ inFileViewerRootedAtPath:(NSString *)rootFullpath
system(prog_path(GNUSTEP_INSTALL_PREFIX, "/make_services"));
data = [NSData dataWithContentsOfFile: servicesPath];
newServices = [NSDeserializer deserializePropertyListFromData: data
if (data)
newServices = [NSDeserializer deserializePropertyListFromData: data
mutableContainers: NO];
else
newServices = [NSDictionary dictionary];
ASSIGN(allServices, newServices);
dict = [newServices objectForKey: @"Applications"];
ASSIGN(applications, dict);

View file

@ -1,4 +1,5 @@
# This file is included in various Makefile's to get version information.
# Compatible with Bourne shell syntax, so it can included there too.
# The gcc version required to compile the library.
GNUSTEP_GUI_GCC=2.8.0