This commit is contained in:
spider 1998-05-30 02:12:28 +00:00
Родитель f9f814bcd1
Коммит fb0de1b93e
1 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -106,10 +106,10 @@ ifdef LIBRARY_NAME
# Win16 requires library names conforming to the 8.3 rule.
# other platforms do not.
#
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(ARCHIVE_SUFFIX)$(STATIC_LIB_SUFFIX)
LIBRARY = $(OBJDIR)/$(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)$(STATIC_LIB_SUFFIX)
SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(STATIC_LIB_SUFFIX)
endif
else
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(STATIC_LIB_SUFFIX)
@ -147,7 +147,11 @@ MAKEDEPFILE := $(addprefix $(OBJDIR)/, make.dep)
ifndef LIBRARY
ifdef LIBRARY_NAME
ifeq ($(OS_ARCH), WINNT)
LIBRARY = $(LIBRARY_NAME).$(LIB_SUFFIX)
else
LIBRARY = lib$(LIBRARY_NAME).$(LIB_SUFFIX)
endif
endif
endif