From f235afe27c3f453b55e58a3bec4dbf1537d66a3d Mon Sep 17 00:00:00 2001 From: spider Date: Thu, 14 May 1998 01:44:50 +0000 Subject: [PATCH] Fixes to remove ARCHIVE_ONLY and use MKSHLIB --- gconfig/IRIX.mk | 2 +- gconfig/ruleset.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gconfig/IRIX.mk b/gconfig/IRIX.mk index 6c6a9919bca9..da6774c60e37 100644 --- a/gconfig/IRIX.mk +++ b/gconfig/IRIX.mk @@ -43,7 +43,7 @@ else CC = cc endif CCC = CC - ODD_CFLAGS = -fullwarn -xansi + ODD_CFLAGS = -fullwarn -xansi ifdef BUILD_OPT ifeq ($(USE_N32),1) OPTIMIZER = -O -OPT:Olimit=4000 diff --git a/gconfig/ruleset.mk b/gconfig/ruleset.mk index d95cfe21021d..d6572b51a4d8 100644 --- a/gconfig/ruleset.mk +++ b/gconfig/ruleset.mk @@ -107,13 +107,13 @@ ifdef LIBRARY_NAME # other platforms do not. # LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(ARCHIVE_SUFFIX)$(LIB_SUFFIX) -ifndef ARCHIVE_ONLY +ifdef MKSHLIB SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).dll IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(LIB_SUFFIX) endif else LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(LIB_SUFFIX) -ifndef ARCHIVE_ONLY +ifdef MKSHLIB ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)_shr.a else