INTEGRATION: CWS obo02 (1.2.30); FILE MERGED

2003/05/20 13:17:35 obo 1.2.30.1: #i14319# ALT_INCLUDE + types.rdb

extensions/test/ole/cpptest/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: hr $ $Date: 2003-03-25 16:04:53 $
+#   last change: $Author: vg $ $Date: 2003-05-22 09:27:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -80,8 +80,8 @@ BOOTSTRAP_SERVICE=FALSE
 
 # --- Files ---
 
-#UNOUCRDEP=	$(SOLARBINDIR)$/applicat.rdb
-#UNOUCRRDB=	$(SOLARBINDIR)$/applicat.rdb
+#UNOUCRDEP=	$(SOLARBINDIR)$/types.rdb
+#UNOUCRRDB=	$(SOLARBINDIR)$/types.rdb
 
 .IF "$(BOOTSTRAP_SERVICE)" == "TRUE"
 UNOUCROUT=	$(OUT)$/inc$/comprehensive
@@ -89,7 +89,7 @@ INCPRE+=	$(OUT)$/inc$/comprehensive
 CPPUMAKERFLAGS += -C
 .ELSE
 UNOUCROUT=	$(OUT)$/inc
-INCPRE+=	$(OUT)$/inc -I$(SOLARINCDIR)$/external$/atl
+INCPRE+=	$(OUT)$/inc -I$(ATL_INCLUDE)
 .ENDIF
 
 UNOTYPES= com.sun.star.bridge.ModelDependent \
@@ -105,7 +105,7 @@ UNOTYPES= com.sun.star.bridge.ModelDependent \
 APP1TARGET=	$(TARGET)
 APP1OBJS=	$(OBJ)$/cppTest.obj
 LIBCMT=msvcrt.lib
-            
+
 
 APP1STDLIBS= \
     $(SALLIB) \
@@ -119,9 +119,9 @@ APP1STDLIBS= \
     comdlg32.lib	\
     comsupp.lib
 
-    
 
-#gdi32.lib winspool.lib  advapi32.lib shell32.lib    odbc32.lib odbccp32.lib 
+
+#gdi32.lib winspool.lib  advapi32.lib shell32.lib    odbc32.lib odbccp32.lib
 
 
 .IF "$(GUI)"=="WNT"