summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-08-20 11:35:32 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-08-20 11:35:32 +0000
commita61201336fe35505492d32b4446585fbee1adf51 (patch)
tree0febb4f775b16d75f2e3fee44cf84e4490945a32
parent4350fb5740a40a0aa73890d1ca40f40f426c8470 (diff)
INTEGRATION: CWS jl11 (1.3.258); FILE MERGED
2004/08/05 12:54:25 jl 1.3.258.1: #i32552# check for NETTOOLKIT in makefile.mk, because the toolkit does not contain ATL
-rw-r--r--extensions/test/ole/cpptest/makefile.mk12
1 files changed, 4 insertions, 8 deletions
diff --git a/extensions/test/ole/cpptest/makefile.mk b/extensions/test/ole/cpptest/makefile.mk
index f41c9a4fa383..7a67916b4eed 100644
--- a/extensions/test/ole/cpptest/makefile.mk
+++ b/extensions/test/ole/cpptest/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: vg $ $Date: 2003-05-22 09:27:33 $
+# last change: $Author: rt $ $Date: 2004-08-20 12:35:32 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -92,16 +92,12 @@ 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
-
-.IF "$(depend)" != ""
-
-.ENDIF # depend
-
APP1TARGET= $(TARGET)
APP1OBJS= $(OBJ)$/cppTest.obj
LIBCMT=msvcrt.lib
@@ -132,6 +128,6 @@ APP2STDLIBS += $(LIBCIMT)
APP1DEF= $(MISC)\$(APP1TARGET).def
# --- Targets ---
-
+.ENDIF #"$(NETTOOLKIT)"==""
.INCLUDE : target.mk