diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-20 11:35:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-20 11:35:08 +0000 |
| commit | 4a1f2940b21b11d3f71cd0bace966df2584cccb7 (patch) | |
| tree | 4410d006b72bcb6299879566ac0e59337e370515 | |
| parent | ca01cc0cdc43b48f8db25a87991a265535262ad0 (diff) | |
INTEGRATION: CWS jl11 (1.4.96); FILE MERGED
2004/08/05 12:53:57 jl 1.4.96.1: #i32552# check for NETTOOLKIT in makefile.mk, because the toolkit does not contain ATL
| -rw-r--r-- | extensions/test/ole/OleConverterVar1/makefile.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/extensions/test/ole/OleConverterVar1/makefile.mk b/extensions/test/ole/OleConverterVar1/makefile.mk index 044a16ceccae..3de34ea9cf42 100644 --- a/extensions/test/ole/OleConverterVar1/makefile.mk +++ b/extensions/test/ole/OleConverterVar1/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: obo $ $Date: 2004-03-17 13:15:49 $ +# last change: $Author: rt $ $Date: 2004-08-20 12:35:08 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -92,18 +92,13 @@ UNOUCROUT= $(OUT)$/inc INCPRE+= $(OUT)$/inc -I$(ATL_INCLUDE) .ENDIF +.IF "$(NETTOOLKIT)"=="" UNOTYPES= com.sun.star.bridge.ModelDependent \ com.sun.star.lang.XMultiServiceFactory \ com.sun.star.bridge.XBridgeSupplier2 \ com.sun.star.uno.XComponentContext \ com.sun.star.lang.XMultiComponentFactory - - -.IF "$(depend)" != "" - -.ENDIF # depend - APP1TARGET= $(TARGET) APP1OBJS= $(OBJ)$/convTest.obj #LIBCMT=msvcrtd.lib @@ -135,6 +130,6 @@ APP2STDLIBS += $(LIBCIMT) APP1DEF= $(MISC)\$(APP1TARGET).def # --- Targets --- - +.ENDIF #"$(NETTOOLKIT)"=="" .INCLUDE : target.mk |