diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 08:10:56 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 08:10:56 +0000 |
| commit | cbfbd0e997cc6e4ad928c63f213c5c8d0d1e2320 (patch) | |
| tree | c1c2baaba6d20bc26a74cfad5d449a1aa82f600d /salhelper | |
| parent | e57a90aa6ab8d473858a689d79745ffe9e66e9a5 (diff) | |
INTEGRATION: CWS sb22 (1.19.22); FILE MERGED
2004/10/22 07:32:02 sb 1.19.22.3: #i20747# Drop minor.micro from names of Unix UNO dynamic libraries; add uno_ prefix to names of Unix core UNO dynamic libraries.
2004/10/18 10:31:51 sb 1.19.22.2: RESYNC: (1.19-1.20); FILE MERGED
2004/09/20 12:06:06 sb 1.19.22.1: #109743# Removed obsolete version map files.
Diffstat (limited to 'salhelper')
| -rw-r--r-- | salhelper/source/makefile.mk | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk index 2ef508c19..e80448766 100644 --- a/salhelper/source/makefile.mk +++ b/salhelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: hr $ $Date: 2004-09-09 11:44:52 $ +# last change: $Author: pjunck $ $Date: 2004-11-03 09:10:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -92,11 +92,11 @@ SLOFILES= \ SLOFILES+=$(SLO)$/staticmb.obj .ENDIF -.IF "$(UNIXVERSIONNAMES)" != "" +.IF "$(GUI)" == "WNT" SHL1TARGET= $(TARGET)$(COMID) .ELSE -SHL1TARGET= $(TARGET)$(UDK_MAJOR)$(COMID) -.ENDIF # UNIXVERSIONNAMES +SHL1TARGET= uno_$(TARGET)$(COMID) +.ENDIF SHL1STDLIBS=$(SALLIB) @@ -111,12 +111,8 @@ DEF1NAME= $(SHL1TARGET) SHL1VERSIONMAP=msci.map .ELIF "$(COMNAME)"=="sunpro5" SHL1VERSIONMAP=sols.map -.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc2" -SHL1VERSIONMAP=lngi.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" SHL1VERSIONMAP=gcc3_linux_intel.map -.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" -SHL1VERSIONMAP=lngi.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" SHL1VERSIONMAP=gcc3_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXSgcc3" |