diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 14:12:01 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 14:12:01 +0000 |
| commit | 36501f12b2cae243faf13752aa7a00014745e709 (patch) | |
| tree | 51ce28c5430e839da4761e920b0721127596d2ea /embeddedobj/util | |
| parent | 2292b018d28df022857e6dba4f32dc25315954b0 (diff) | |
INTEGRATION: CWS mav14 (1.6.24); FILE MERGED
2005/01/05 10:51:06 mav 1.6.24.3: #100000# resync problem
2004/11/26 10:35:10 mav 1.6.24.2: #i37640# remove unused file
2004/11/25 17:18:52 mav 1.6.24.1: #i37640# MSOLE dialog must create ole object except the case of own format
Diffstat (limited to 'embeddedobj/util')
| -rw-r--r-- | embeddedobj/util/makefile.mk | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk index c2dc6691ca07..6930a8864e84 100644 --- a/embeddedobj/util/makefile.mk +++ b/embeddedobj/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: kz $ $Date: 2004-10-04 19:59:13 $ +# last change: $Author: kz $ $Date: 2005-01-18 15:12:01 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -64,8 +64,9 @@ PRJ=.. PRJNAME=embeddedobj TARGET=embobj -LIBTARGET=NO -USE_DEFFILE=TRUE +#LIBTARGET=NO +#USE_DEFFILE=TRUE +ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------------- @@ -73,12 +74,9 @@ USE_DEFFILE=TRUE # --- Files -------------------------------------------------------- -SHL1TARGET= $(TARGET) - -SHL1IMPLIB= i$(TARGET) -SHL1OBJS= \ +LIB1OBJFILES= \ $(SLO)$/miscobj.obj\ - $(SLO)$/specialobject.obj\ + $(SLO)$/specialobject.obj\ $(SLO)$/persistence.obj\ $(SLO)$/embedobj.obj\ $(SLO)$/inplaceobj.obj\ @@ -89,18 +87,30 @@ SHL1OBJS= \ $(SLO)$/convert.obj\ $(SLO)$/docholder.obj\ $(SLO)$/confighelper.obj\ - $(SLO)$/closepreventer.obj\ $(SLO)$/intercept.obj +LIB1TARGET=$(SLB)$/$(TARGET).lib + +SHL1TARGET= $(TARGET) + SHL1STDLIBS=\ $(SALLIB)\ $(CPPULIB)\ $(COMPHELPERLIB)\ $(CPPUHELPERLIB) +SHL1DEPN= +SHL1IMPLIB= i$(TARGET) + +SHL1LIBS= $(LIB1TARGET) + SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) +DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \ + $(LIB1TARGET) + +DEFLIB1NAME=$(TARGET) DEF1EXPORTFILE= exports.dxp # --- Targets ------------------------------------------------------------- @@ -108,3 +118,8 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk +$(MISC)$/$(SHL1TARGET).flt: makefile.mk + @echo ------------------------------ + @echo CLEAR_THE_FILE > $@ + @echo __CT >>$@ + |