INTEGRATION: CWS cmcfixes43 (1.6.54); FILE MERGED

2008/03/06 09:54:37 cmc 1.6.54.2: #i86629 unify gcc maps
2008/03/03 10:49:08 cmc 1.6.54.1: #i86629 unify gcc maps
This commit is contained in:
Ivo Hinkelmann
2008-04-24 16:11:06 +00:00
parent ee24969b83
commit e2e55ca162

View File

@@ -8,7 +8,7 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.7 $ # $Revision: 1.8 $
# #
# This file is part of OpenOffice.org. # This file is part of OpenOffice.org.
# #
@@ -53,8 +53,8 @@ SHL1STDLIBS=\
SHL1IMPLIB= i$(SHL1TARGET) SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET) DEF1NAME =$(SHL1TARGET)
.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3" .IF "$(COMNAME)" == "gcc3"
SHL1VERSIONMAP = linuxigcc3_export.map SHL1VERSIONMAP = gcc3_export.map
.ELSE .ELSE
SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
.ENDIF .ENDIF
@@ -71,8 +71,8 @@ SHL2STDLIBS=\
SHL2IMPLIB= i$(SHL2TARGET) SHL2IMPLIB= i$(SHL2TARGET)
DEF2NAME =$(SHL2TARGET) DEF2NAME =$(SHL2TARGET)
.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3" .IF "$(COMNAME)" == "gcc3"
SHL2VERSIONMAP = linuxigcc3_export.map SHL2VERSIONMAP = gcc3_export.map
.ELSE .ELSE
SHL2VERSIONMAP = $(PRJ)$/qa$/export.map SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
.ENDIF .ENDIF