ICU-3485 Rename the static libraries

X-SVN-Rev: 14252
This commit is contained in:
George Rhoten 2004-01-07 07:07:17 +00:00
parent 108e25e702
commit ddb9791b82
11 changed files with 33 additions and 18 deletions

View file

@ -4,7 +4,7 @@
# Corporation and others. All Rights Reserved.
#
#******************************************************************************
## Makefile.in for ICU - icu.so
## Makefile.in for ICU - icuuc.so
## Stephen F. Booth
## Source directory information
@ -15,6 +15,7 @@ top_builddir = ..
## All the flags and other definitions are included here.
include $(top_builddir)/icudefs.mk
-include Makefile.local
## Build directory information
subdir = common
@ -27,7 +28,7 @@ CLEANFILES = *~ $(DEPS)
TARGET_STUBNAME=uc
ifneq ($(ENABLE_STATIC),)
TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).a
TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
endif
ifneq ($(ENABLE_SHARED),)

View file

@ -2,7 +2,7 @@
#******************************************************************************
# Copyright (C) 1999-2003, International Business Machines
# Corporation and others. All Rights Reserved.
# $Revision: 1.35 $
# $Revision: 1.36 $
#******************************************************************************
# This Makefile.inc is designed to be included into projects which make use
# of the ICU.
@ -43,6 +43,11 @@ ICUPREFIX = icu
PACKAGE = @PACKAGE@
LIBICU = lib$(ICUPREFIX)
# Static library prefix and file extension
STATIC_PREFIX = s
LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
A = a
# Suffix at the end of libraries. Usually empty.
ICULIBSUFFIX = @ICULIBSUFFIX@
# ICULIBSUFFIX_VERSION is non-empty if it is to contain a library

View file

@ -18,6 +18,7 @@ subdir = data
#lib icu data for link
LIB_ICUDATA_NAME=lib$(ICUDATA_NAME)
LIB_STATIC_ICUDATA_NAME=lib$(STATIC_PREFIX)$(ICUDATA_NAME)
# sanity!
ICUDT=$(ICUDATA_PLATFORM_NAME)_
@ -106,15 +107,22 @@ PKGDATA_INVOKE:=$(subst :$(top_builddir)/data/out,,$(INVOKE)) $(PKGDATA_INVOKE_O
packagedata: icupkg.inc $(BUILDDIR)/icudata.lst
$(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(BUILDDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(BUILDDIR)/icudata.lst
ifneq ($(ENABLE_STATIC),)
# TODO: Prevent complete rebuilding between builds. Requires checking for existence of renamed file.
# mv -f $(OUTDIR)/$(LIB_STATIC_ICUDATA_NAME).$(A) $(OUTDIR)/$(LIB_ICUDATA_NAME).$(A)
$(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(BUILDDIR) -p $(ICUDATA_NAME) -m static $(BUILDDIR)/icudata.lst
mv -f $(OUTDIR)/$(LIB_ICUDATA_NAME).$(A) $(OUTDIR)/$(LIB_STATIC_ICUDATA_NAME).$(A)
endif
## Install ICU data.
install-local: $(BUILDDIR)/icudata.lst ./icupkg.inc $(OS390INSTALL)
install-local: $(BUILDDIR)/icudata.lst ./icupkg.inc $(OS390INSTALL)
$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR)
$(PKGDATA_INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e $(ICUDATA_ENTRY_POINT) -T $(BUILDDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(BUILDDIR)/icudata.lst -I $(DESTDIR)$(ICUPKGDATA_DIR)
ifneq ($(ENABLE_STATIC),)
# TODO: Prevent complete rebuilding between builds. Requires checking for existence of renamed file.
# mv -f $(OUTDIR)/$(LIB_STATIC_ICUDATA_NAME).$(A) $(OUTDIR)/$(LIB_ICUDATA_NAME).$(A)
$(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(BUILDDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(BUILDDIR)/icudata.lst -I $(DESTDIR)$(ICUPKGDATA_DIR)
mv -f $(OUTDIR)/$(LIB_ICUDATA_NAME).$(A) $(OUTDIR)/$(LIB_STATIC_ICUDATA_NAME).$(A)
$(INSTALL-L) $(OUTDIR)/$(LIB_STATIC_ICUDATA_NAME).$(A) $(DESTDIR)$(ICUPKGDATA_DIR)/$(LIB_STATIC_ICUDATA_NAME).$(A)
endif
####

View file

@ -27,7 +27,7 @@ CLEANFILES = *~ $(DEPS)
TARGET_STUBNAME=io
ifneq ($(ENABLE_STATIC),)
TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).a
TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
endif
ifneq ($(ENABLE_SHARED),)

View file

@ -28,7 +28,7 @@ CLEANFILES = *~ $(DEPS)
TARGET_STUBNAME=i18n
ifneq ($(ENABLE_STATIC),)
TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).a
TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
endif
ifneq ($(ENABLE_SHARED),)

View file

@ -147,6 +147,11 @@ MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR)
ICUPREFIX = icu
LIBICU = lib$(ICUPREFIX)
# Static library prefix and file extension
STATIC_PREFIX = s
LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
A = a
# Force removal [for make clean]
RMV = rm -rf
# Platform commands to remove or move executable and library targets

View file

@ -2,9 +2,6 @@
## others. All Rights Reserved.
## Makefile.in for ICU - layout
SO_TARGET_VERSION = @LIB_VERSION@
SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
## Install directory information
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@ -24,7 +21,7 @@ CLEANFILES = *~ $(DEPS)
TARGET_STUBNAME=le
ifneq ($(ENABLE_STATIC),)
TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).a
TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
endif
ifneq ($(ENABLE_SHARED),)

View file

@ -2,9 +2,6 @@
## others. All Rights Reserved.
## Makefile.in for ICU - layout
SO_TARGET_VERSION = @LIB_VERSION@
SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
## Install directory information
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@ -24,7 +21,7 @@ CLEANFILES = *~ $(DEPS)
TARGET_STUBNAME=lx
ifneq ($(ENABLE_STATIC),)
TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).a
TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
endif
ifneq ($(ENABLE_SHARED),)

View file

@ -27,7 +27,7 @@ CLEANFILES = *~ $(DEPS)
TARGET_STUBNAME=data
ifneq ($(ENABLE_STATIC),)
TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).a
TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
endif
ifneq ($(ENABLE_SHARED),)

View file

@ -20,7 +20,7 @@ CLEANFILES = *~ $(DEPS) $(ALL_TARGETS)
## Target information
ifneq ($(ENABLE_STATIC),)
TARGET = $(LIBICU)ctestfw$(ICULIBSUFFIX).a
TARGET = $(LIBSICU)ctestfw$(ICULIBSUFFIX).a
endif
CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil

View file

@ -20,12 +20,14 @@ CLEANFILES = *~ $(DEPS)
## Target information
TARGET_STUBNAME=toolutil
ifneq ($(ENABLE_STATIC),)
TARGET = $(LIBICU)toolutil$(ICULIBSUFFIX).a
TARGET = $(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
endif
ifneq ($(ENABLE_SHARED),)
SO_TARGET = $(LIBICU)toolutil$(ICULIBSUFFIX).$(SO)
SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET)
endif