Fixes for toplevel shared support

git-svn-id: svn://10.0.0.236/trunk@1687 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
spider 1998-05-14 22:53:21 +00:00
parent 6ba088ac61
commit 3a7a283400

View File

@ -109,7 +109,7 @@ ifdef LIBRARY_NAME
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(ARCHIVE_SUFFIX)$(STATIC_LIB_SUFFIX)
ifndef ARCHIVE_ONLY
SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(LIB_SUFFIX)
IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(STATIC_LIB_SUFFIX)
endif
else
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(STATIC_LIB_SUFFIX)
@ -152,7 +152,7 @@ endif
# Rules to convert EXTRA_LIBS to platform-dependent naming scheme
ifdef AR_LIBS
AR_LIBS := $(addprefix $(CONFIG_DIST_LIB)$(OPT_SLASH)$(LIB_PREFIX), $(AR_LIBS:%=%$(LIBRARY_VERSION)$(ARCHIVE_SUFFIX)$(STATIC_LIB_SUFFIX)))
AR_LIBS := $(addprefix $(CONFIG_DIST_LIB)$(OPT_SLASH)lib, $(AR_LIBS:%=%$(LIBRARY_VERSION)$(ARCHIVE_SUFFIX)$(STATIC_LIB_SUFFIX)))
endif
ifdef LIBRARY