From 40dbc61cc0f669a617cc74f6e3ec393a95742378 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 24 Apr 2008 15:57:47 +0000 Subject: INTEGRATION: CWS cmcfixes43 (1.12.6); FILE MERGED 2008/03/03 09:38:57 cmc 1.12.6.1: #i86629 unify gcc maps --- jvmaccess/util/makefile.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk index b49513f8fe51..1a08b4e8190b 100644 --- a/jvmaccess/util/makefile.mk +++ b/jvmaccess/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # # This file is part of OpenOffice.org. # @@ -59,18 +59,10 @@ SHL1RPATH = URELIB SHL1VERSIONMAP = msvc_win32_intel.map .ELIF "$(COMNAME)" == "sunpro5" SHL1VERSIONMAP = cc5_solaris_sparc.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)" == "OS2Igcc3" -SHL1VERSIONMAP = gcc3_linux_intel.map -.ELIF "$(OS)$(CPU)$(COMNAME)"=="MACOSXIgcc3" -SHL1VERSIONMAP = gcc3_linux_intel.map .ELIF "$(GUI)$(COM)" == "WNTGCC" SHL1VERSIONMAP = mingw.map +.ELIF "$(COMNAME)" == "gcc3" +SHL1VERSIONMAP = gcc3.map .ENDIF DEF1NAME = $(SHL1TARGET) -- cgit