diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-09 12:51:07 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-09 12:51:07 +0000 |
| commit | 74786b269b557760d4f841b8a08baaec1beee822 (patch) | |
| tree | 9aa5e6bcbeae097853ca232963edce78c12c7828 /cppu/util | |
| parent | bbc5171c0ca4b000e0ab2acdf8d31a8079f2e610 (diff) | |
INTEGRATION: CWS bunoexttm (1.8.48); FILE MERGED
2007/02/28 17:01:48 kr 1.8.48.6: simplified: moved class to impl., renamed header
2007/02/28 13:18:50 kr 1.8.48.5: fixed: added map files for purpenvhelper
2007/02/07 11:15:18 kr 1.8.48.4: fixed: missing dependency
2007/02/02 15:33:38 kr 1.8.48.3: fixed: UNIXVERSIONAMES
2007/01/30 08:42:22 kr 1.8.48.2: fixed: version numbers for purpenvhelper only
2007/01/26 09:51:55 kr 1.8.48.1: joined from utf2
Diffstat (limited to 'cppu/util')
| -rw-r--r-- | cppu/util/makefile.mk | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index ce1978267732..2e8340df0341 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hr $ $Date: 2006-04-19 13:50:07 $ +# last change: $Author: kz $ $Date: 2007-05-09 13:51:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,11 +40,15 @@ USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE +.IF "$(OS)" != "WNT" UNIXVERSIONNAMES=UDK +.ENDIF + # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : ../source/helper/purpenv/export.mk # --- Files -------------------------------------------------------- @@ -55,7 +59,7 @@ SHL1LIBS= \ $(SLB)$/cppu_cppu.lib .IF "$(GUI)" == "WNT" -SHL1TARGET=$(TARGET) +SHL1TARGET=$(TARGET)$(UDK_MAJOR) .ELSE SHL1TARGET= uno_$(TARGET) .ENDIF @@ -72,7 +76,29 @@ SHL1VERSIONMAP=$(TARGET).map DEF1NAME=$(SHL1TARGET) + +SHL2TARGET := $(NAMEpurpenv_helper) +DEF2NAME := $(SHL2TARGET) +SHL2VERSIONMAP:=$(SHL2TARGET).map +SHL2DEF := $(MISC)$/$(SHL2TARGET).def +SHL2IMPLIB := i$(SHL2TARGET) +SHL2STDLIBS := $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL2OBJS := \ + $(SLO)$/helper_purpenv_Environment.obj \ + $(SLO)$/helper_purpenv_Mapping.obj \ + $(SLO)$/helper_purpenv_Proxy.obj + + # --- Targets ------------------------------------------------------ +.PHONY: ALLTAR + + +ALLTAR: $(SHL2TARGETN) + $(MAKE) $(MAKECMDGOALS) -f extra.mk + + .INCLUDE : target.mk + +$(SHL2TARGETN): $(SHL1TARGETN) |