Changeset 1382


Ignore:
Timestamp:
Mar 14, 2016, 6:32:59 PM (9 years ago)
Author:
dmik
Message:

icu: Disable versioned DLL creation and add EXTRA_TARGETS for import libs.

Versioned DLLs make no sense on OS/2 (especially as symlinks).

EXTRA_TARGETS is necessary because building an import library on OS/2 is a
separate step.

Location:
icu/trunk/source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified icu/trunk/source/common/Makefile.in

    r1367 r1382  
    3737ifneq ($(ENABLE_SHARED),)
    3838SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
    39 ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
     39ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) $(EXTRA_TARGETS)
    4040
    4141ifeq ($(ENABLE_SO_VERSION_DATA),1)
    … …  
    150150ifneq ($(ENABLE_SHARED),)
    151151        $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
     152ifeq ($(DISABLE_VERSIONED_LIBS),)
    152153ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
    153154        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
    … …  
    156157endif
    157158endif
     159endif
    158160ifneq ($(IMPORT_LIB_EXT),)
    159161        $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
     162ifeq ($(DISABLE_VERSIONED_LIBS),)
    160163ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
    161164        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
    … …  
    163166ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
    164167        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
     168endif
    165169endif
    166170endif

  • TabularUnified icu/trunk/source/i18n/Makefile.in

    r1367 r1382  
    3333ifneq ($(ENABLE_SHARED),)
    3434SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
    35 ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
     35ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) $(EXTRA_TARGETS)
    3636
    3737ifeq ($(ENABLE_SO_VERSION_DATA),1)
    … …  
    140140ifneq ($(ENABLE_SHARED),)
    141141        $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
     142ifeq ($(DISABLE_VERSIONED_LIBS),)
    142143ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
    143144        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
    … …  
    146147endif
    147148endif
     149endif
    148150ifneq ($(IMPORT_LIB_EXT),)
    149151        $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
     152ifeq ($(DISABLE_VERSIONED_LIBS),)
    150153ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
    151154        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
    … …  
    153156ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
    154157        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
     158endif
    155159endif
    156160endif

  • TabularUnified icu/trunk/source/io/Makefile.in

    r1367 r1382  
    3333ifneq ($(ENABLE_SHARED),)
    3434SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
    35 ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
     35ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) $(EXTRA_TARGETS)
    3636
    3737ifeq ($(ENABLE_SO_VERSION_DATA),1)
    … …  
    101101ifneq ($(ENABLE_SHARED),)
    102102        $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
     103ifeq ($(DISABLE_VERSIONED_LIBS),)
    103104ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
    104105        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
    … …  
    107108endif
    108109endif
     110endif
    109111ifneq ($(IMPORT_LIB_EXT),)
    110112        $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
     113ifeq ($(DISABLE_VERSIONED_LIBS),)
    111114ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
    112115        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
    … …  
    114117ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
    115118        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
     119endif
    116120endif
    117121endif

  • TabularUnified icu/trunk/source/layout/Makefile.in

    r1367 r1382  
    3232ifneq ($(ENABLE_SHARED),)
    3333SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
    34 ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
     34ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) $(EXTRA_TARGETS)
    3535
    3636ifeq ($(ENABLE_SO_VERSION_DATA),1)
    … …  
    185185ifneq ($(ENABLE_SHARED),)
    186186        $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
     187ifeq ($(DISABLE_VERSIONED_LIBS),)
    187188ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
    188189        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
    … …  
    191192endif
    192193endif
     194endif
    193195ifneq ($(IMPORT_LIB_EXT),)
    194196        $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
     197ifeq ($(DISABLE_VERSIONED_LIBS),)
    195198ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
    196199        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
    … …  
    198201ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
    199202        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
     203endif
    200204endif
    201205endif

  • TabularUnified icu/trunk/source/layoutex/Makefile.in

    r1367 r1382  
    3232ifneq ($(ENABLE_SHARED),)
    3333SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
    34 ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
     34ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) $(EXTRA_TARGETS)
    3535
    3636ifeq ($(ENABLE_SO_VERSION_DATA),1)
    … …  
    114114ifneq ($(ENABLE_SHARED),)
    115115        $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
     116ifeq ($(DISABLE_VERSIONED_LIBS),)
    116117ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
    117118        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
    … …  
    120121endif
    121122endif
     123endif
    122124ifneq ($(IMPORT_LIB_EXT),)
    123125        $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
     126ifeq ($(DISABLE_VERSIONED_LIBS),)
    124127ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
    125128        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
    … …  
    127130ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
    128131        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
     132endif
    129133endif
    130134endif

  • TabularUnified icu/trunk/source/stubdata/Makefile.in

    r1367 r1382  
    3434ifneq ($(ENABLE_SHARED),)
    3535SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
    36 ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT)
     36ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT) $(EXTRA_TARGETS)
    3737endif
    3838
    … …  
    8787ifneq ($(ENABLE_SHARED),)
    8888        $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
     89ifeq ($(DISABLE_VERSIONED_LIBS),)
    8990ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
    9091        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
    … …  
    9394endif
    9495endif
     96endif
    9597ifneq ($(IMPORT_LIB_EXT),)
    9698        $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
     99ifeq ($(DISABLE_VERSIONED_LIBS),)
    97100ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
    98101        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
    … …  
    100103ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
    101104        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
     105endif
    102106endif
    103107endif

  • TabularUnified icu/trunk/source/tools/ctestfw/Makefile.in

    r1367 r1382  
    3333ifneq ($(ENABLE_SHARED),)
    3434SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
    35 ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
     35ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) $(EXTRA_TARGETS)
    3636endif
    3737
    … …  
    8383ifneq ($(ENABLE_SHARED),)
    8484        $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
     85ifeq ($(DISABLE_VERSIONED_LIBS),)
    8586ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
    8687        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
    … …  
    8990endif
    9091endif
     92endif
    9193ifneq ($(IMPORT_LIB_EXT),)
    9294        $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
     95ifeq ($(DISABLE_VERSIONED_LIBS),)
    9396ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
    9497        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
    … …  
    9699ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
    97100        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
     101endif
    98102endif
    99103endif

  • TabularUnified icu/trunk/source/tools/toolutil/Makefile.in

    r1367 r1382  
    3333ifneq ($(ENABLE_SHARED),)
    3434SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
    35 ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
     35ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) $(EXTRA_TARGETS)
    3636endif
    3737
    … …  
    9494ifneq ($(ENABLE_SHARED),)
    9595        $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
     96ifeq ($(DISABLE_VERSIONED_LIBS),)
    9697ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
    9798        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
    … …  
    100101endif
    101102endif
     103endif
    102104ifneq ($(IMPORT_LIB_EXT),)
    103105        $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
     106ifeq ($(DISABLE_VERSIONED_LIBS),)
    104107ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
    105108        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
    … …  
    107110ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
    108111        cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
     112endif
    109113endif
    110114endif
Note: See TracChangeset for help on using the changeset viewer.