INTEGRATION: CWS cmcfixes35 (1.27.4); FILE MERGED

2007/07/24 12:09:13 cmc 1.27.4.5: #i77975 as per kr suggestion, remove mingwin.map in favour of gcc3.map
2007/07/23 11:49:14 cmc 1.27.4.4: #i79907# repeat cppuhelper map merge in salhelper
2007/06/29 10:42:14 cmc 1.27.4.3: remove those new files
2007/06/27 15:00:40 cmc 1.27.4.2: make generic
2007/06/13 11:10:47 cmc 1.27.4.1: #i77975 distinguish between 32bit and 64bit gcc mangling
This commit is contained in:
Jens-Heiner Rechtien 2007-08-03 11:32:52 +00:00
parent 1cd0db05b4
commit 553a8adb97

View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.27 $
# $Revision: 1.28 $
#
# last change: $Author: vg $ $Date: 2007-05-25 10:55:32 $
# last change: $Author: hr $ $Date: 2007-08-03 12:32:52 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -80,16 +80,8 @@ DEF1NAME= $(SHL1TARGET)
SHL1VERSIONMAP=msci.map
.ELIF "$(COMNAME)"=="sunpro5"
SHL1VERSIONMAP=sols.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXSgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="MACOSXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
.ELIF "$(GUI)$(COM)"=="WNTGCC"
SHL1VERSIONMAP=mingw_intel.map
.ELIF "$(COMNAME)"=="gcc3"
SHL1VERSIONMAP=gcc3.map
.ENDIF
# --- Targets ------------------------------------------------------