diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-09 13:59:05 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-09 13:59:05 +0000 |
| commit | 778dde19b385a48cf735f8800c3434487fab697a (patch) | |
| tree | dcfcc370d4dd4d3e2b79fd50dab71f2f5212037b /extensions/test/ole/cpptest | |
| parent | 8637709926860af045026420eabd5ea8ef3d09a6 (diff) | |
INTEGRATION: CWS ause028 (1.4.138); FILE MERGED
2005/05/03 09:39:15 hjs 1.4.138.1: #109143# use generated includes from solver; cleanup
Diffstat (limited to 'extensions/test/ole/cpptest')
| -rw-r--r-- | extensions/test/ole/cpptest/makefile.mk | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/extensions/test/ole/cpptest/makefile.mk b/extensions/test/ole/cpptest/makefile.mk index 7a67916b4eed..b108d9c1368c 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.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2004-08-20 12:35:32 $ +# last change: $Author: hr $ $Date: 2005-06-09 14:59:05 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -60,43 +60,24 @@ # #************************************************************************* -PRJ=..$/..$/..$/ +PRJ=..$/..$/.. PRJNAME=extensions TARGET=cppTest TARGETTYPE=CUI LIBTARGET=NO -#USE_DEFFILE= TRUE -NO_BSYMBOLIC= TRUE ENABLE_EXCEPTIONS=TRUE -BOOTSTRAP_SERVICE=FALSE # --- Settings --- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk # --- Files --- -#UNOUCRDEP= $(SOLARBINDIR)$/types.rdb -#UNOUCRRDB= $(SOLARBINDIR)$/types.rdb - -.IF "$(BOOTSTRAP_SERVICE)" == "TRUE" -UNOUCROUT= $(OUT)$/inc$/comprehensive -INCPRE+= $(OUT)$/inc$/comprehensive -CPPUMAKERFLAGS += -C -.ELSE -UNOUCROUT= $(OUT)$/inc -INCPRE+= $(OUT)$/inc -I$(ATL_INCLUDE) -.ENDIF +INCPRE+=-I$(ATL_INCLUDE) .IF "$(NETTOOLKIT)"=="" -UNOTYPES= com.sun.star.bridge.ModelDependent \ - com.sun.star.lang.XMultiServiceFactory \ - com.sun.star.bridge.XBridgeSupplier2 - APP1TARGET= $(TARGET) APP1OBJS= $(OBJ)$/cppTest.obj @@ -115,14 +96,8 @@ APP1STDLIBS= \ comdlg32.lib \ comsupp.lib - - -#gdi32.lib winspool.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib - - .IF "$(GUI)"=="WNT" APP1STDLIBS += $(LIBCIMT) -APP2STDLIBS += $(LIBCIMT) .ENDIF APP1DEF= $(MISC)\$(APP1TARGET).def |