$NetBSD: patch-aa,v 1.1.1.1 2005/10/01 04:18:47 rh Exp $ --- GNUmakefile.orig 2005-01-24 03:35:34.000000000 +1000 +++ GNUmakefile @@ -26,11 +26,11 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=skyrix-objc -VERSION=lf2.95.3 +VERSION=2.95.3 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -LIBRARY_NAME = libobjc +LIBRARY_NAME = libobjc_lf2 # dce, decosf1, irix, mach, os2, posix, pthreads, single, solaris, vxworks THREADING = single @@ -47,7 +47,7 @@ GC_HEADER_FILES = \ gc_typed.h \ weakpointer.h \ -libobjc_HEADER_FILES = \ +libobjc_lf2_HEADER_FILES = \ objc-decls.h \ Object.h \ Protocol.h \ @@ -62,13 +62,13 @@ libobjc_HEADER_FILES = \ typedstream.h \ # NXConstStr.h \ -libobjc_OBJC_FILES = \ +libobjc_lf2_OBJC_FILES = \ Object.m \ Protocol.m \ linking.m \ # NXConstStr.m \ -libobjc_C_FILES = \ +libobjc_lf2_C_FILES = \ globals.c \ archive.c \ class.c \ @@ -97,10 +97,10 @@ ADDITIONAL_CPPFLAGS += \ ADDITIONAL_CFLAGS += -O2 -Wall -libobjc_HEADER_FILES_DIR = . -libobjc_HEADER_FILES_INSTALL_DIR = /objc +libobjc_lf2_HEADER_FILES_DIR = . +libobjc_lf2_HEADER_FILES_INSTALL_DIR = /objc_lf2 -libobjc_DLL_DEF = libobjc.def +libobjc_lf2_DLL_DEF = libobjc.def ifeq ($(THREADING), single) ADDITIONAL_CPPFLAGS += -DOBJC_WITHOUT_THREADING @@ -109,7 +109,7 @@ endif ifeq ($(gc), yes) ADDITIONAL_CPPFLAGS += -DOBJC_WITH_GC=1 -DGC_DEBUG=1 ADDITIONAL_CPPFLAGS += -DDEBUG_OBJC_GC=0 -libobjc_LIBRARIES_DEPEND_UPON += -lgc +libobjc_lf2_LIBRARIES_DEPEND_UPON += -lgc ifeq ($(THREADING), solaris) ADDITIONAL_CPPFLAGS += -DSOLARIS_THREADS