From 1cd066bacbb23ad30364322cd87c56b58d68c361 Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 25 Oct 2001 09:51:35 +0000 Subject: [PATCH] Updated code to decide if to include library.make or clibrary.make to the actual gnustep-make versioning git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/libobjc/trunk@11246 72102866-910b-0410-8b05-ffd578937521 --- GNUmakefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/GNUmakefile b/GNUmakefile index 2347bd1..84c9a54 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -151,11 +151,23 @@ ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/objc -include config/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.make -include GNUmakefile.preamble + +# Use library.make for gnustep-make version 1.0.x +# Use clibrary.make for all other gnustep-make versions +USE_LIBRARY_MAKE=no + ifeq ($(GNUSTEP_MAKE_MAJOR_VERSION),1) + ifeq ($(GNUSTEP_MAKE_MINOR_VERSION),0) + USE_LIBRARY_MAKE=yes + endif +endif + +ifeq ($(USE_LIBRARY_MAKE),yes) include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/library.make else include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/clibrary.make endif + -include GNUmakefile.postamble #ADDITIONAL_INCLUDE_DIRS += -Iobjc -I. -I../gcc -I../gcc/config