diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-09 13:58:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-09 13:58:26 +0000 |
| commit | cc13bd3d0702a885cf09d74a2283d39f5c3ef956 (patch) | |
| tree | eb6813a515fccea544f79183a12a68505cdba199 | |
| parent | ebe6558d471a3725874b51fff12dd6dd2a8d76dd (diff) | |
INTEGRATION: CWS ause028 (1.5.138); FILE MERGED
2005/05/03 09:39:13 hjs 1.5.138.1: #109143# use generated includes from solver; cleanup
| -rw-r--r-- | extensions/test/ole/OleConverterVar1/makefile.mk | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/extensions/test/ole/OleConverterVar1/makefile.mk b/extensions/test/ole/OleConverterVar1/makefile.mk index 3de34ea9cf42..b87d15e00457 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.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2004-08-20 12:35:08 $ +# last change: $Author: hr $ $Date: 2005-06-09 14:58:26 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -60,48 +60,27 @@ # #************************************************************************* -PRJ=..$/..$/..$/ +PRJ=..$/..$/.. PRJNAME=extensions TARGET=convTest 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 \ - com.sun.star.uno.XComponentContext \ - com.sun.star.lang.XMultiComponentFactory APP1TARGET= $(TARGET) APP1OBJS= $(OBJ)$/convTest.obj -#LIBCMT=msvcrtd.lib APP1STDLIBS= \ @@ -117,19 +96,13 @@ APP1STDLIBS= \ $(COMPATH)$/atlmfc$/lib$/atls.lib \ advapi32.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 -# --- Targets --- .ENDIF #"$(NETTOOLKIT)"=="" +# --- Targets --- .INCLUDE : target.mk |