summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-08-20 11:35:20 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-08-20 11:35:20 +0000
commit4350fb5740a40a0aa73890d1ca40f40f426c8470 (patch)
treeabbc2e37e2ae5580334f9d1ac57239e34346d008
parent4a1f2940b21b11d3f71cd0bace966df2584cccb7 (diff)
INTEGRATION: CWS jl11 (1.2.258); FILE MERGED
2004/08/05 12:54:10 jl 1.2.258.1: #i32552# check for NETTOOLKIT in makefile.mk, because the toolkit does not contain ATL
-rw-r--r--extensions/test/ole/cppToUno/makefile.mk12
1 files changed, 4 insertions, 8 deletions
diff --git a/extensions/test/ole/cppToUno/makefile.mk b/extensions/test/ole/cppToUno/makefile.mk
index fc6e5edfc012..e7d72e89246c 100644
--- a/extensions/test/ole/cppToUno/makefile.mk
+++ b/extensions/test/ole/cppToUno/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: vg $ $Date: 2003-05-22 09:27:10 $
+# last change: $Author: rt $ $Date: 2004-08-20 12:35:20 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -88,16 +88,12 @@ UNOUCROUT= $(OUT)$/inc
INCPRE+= $(OUT)$/inc -I$(ATL_INCLUDE)
+.IF "$(NETTOOLKIT)"==""
UNOTYPES= com.sun.star.lang.XMultiServiceFactory \
com.sun.star.script.XInvocation \
oletest.XCallback
-
-.IF "$(depend)" != ""
-
-.ENDIF # depend
-
APP1TARGET= $(TARGET)
APP1OBJS= $(OBJ)$/testcppuno.obj
@@ -125,6 +121,6 @@ APP1STDLIBS += $(LIBCIMT)
APP1DEF= $(MISC)\$(APP1TARGET).def
# --- Targets ---
-
+.ENDIF #"$(NETTOOLKIT)"==""
.INCLUDE : target.mk