diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-03-26 11:37:38 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-03-26 11:37:38 +0000 |
| commit | 277355d942d7bd6e74ae0e4435b7cb80320b68c2 (patch) | |
| tree | bcee42fac1db7256da1b0b2bd96cef33ea60a3b4 | |
| parent | 2879c3db6f16e6d5c309005f407ddb5ac8409165 (diff) | |
INTEGRATION: CWS obo25 (1.14.124); FILE MERGED
2008/03/20 11:08:10 obo 1.14.124.1: #i87279# remove DISABLE_ADO switch
| -rw-r--r-- | connectivity/source/drivers/ado/makefile.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk index 787caed967d8..0f1924ba604b 100644 --- a/connectivity/source/drivers/ado/makefile.mk +++ b/connectivity/source/drivers/ado/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: ihi $ $Date: 2007-06-05 10:44:54 $ +# last change: $Author: obo $ $Date: 2008-03-26 12:37:38 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -49,10 +49,6 @@ ENVCFLAGS+=/FR$(SLO)$/ .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/version.mk -.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" -DISABLE_ADO=TRUE -.ENDIF -.IF "$(DISABLE_ADO)"=="" # --- Files ------------------------------------- EXCEPTIONSFILES= \ @@ -116,11 +112,9 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) DEF1EXPORTFILE= exports.dxp -.ENDIF # "$(DISABLE_ADO)"=="" - # --- Targets ---------------------------------- .INCLUDE : target.mk -.ENDIF +.ENDIF # "$(GUI)"=="WNT" |