diff options
| -rw-r--r-- | dbaccess/prj/build.lst | 3 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/core/inc/recovery/dbdocrecovery.hxx (renamed from dbaccess/source/core/dataaccess/dbdocrecovery.hxx) | 0 | ||||
| -rw-r--r-- | dbaccess/source/core/recovery/dbdocrecovery.cxx (renamed from dbaccess/source/core/dataaccess/dbdocrecovery.cxx) | 2 | ||||
| -rw-r--r-- | dbaccess/source/core/recovery/makefile.mk | 52 | ||||
| -rw-r--r-- | dbaccess/util/makefile.mk | 1 |
6 files changed, 57 insertions, 3 deletions
diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst index c52076ffa4a6..f9ba2e4abd5f 100644 --- a/dbaccess/prj/build.lst +++ b/dbaccess/prj/build.lst @@ -4,6 +4,7 @@ ba dbaccess\inc nmake - all ba_inc NULL ba dbaccess\source\ui\inc nmake - all ba_uiinc ba_inc NULL ba dbaccess\source\core\api nmake - all ba_capi ba_inc NULL ba dbaccess\source\core\dataaccess nmake - all ba_cdaccess ba_capi ba_inc NULL +ba dbaccess\source\core\recovery nmake - all ba_crecovery ba_inc NULL ba dbaccess\source\core\misc nmake - all ba_cmisc ba_cdaccess ba_inc NULL ba dbaccess\source\core\resource nmake - all ba_cres ba_cmisc ba_inc NULL ba dbaccess\source\filter\xml nmake - all ba_ffilter ba_shared ba_util ba_inc NULL @@ -24,6 +25,6 @@ ba dbaccess\source\ui\relationdesign nmake - all ba_uirelationdesign ba_uiinc b ba dbaccess\source\ui\tabledesign nmake - all ba_uitabledesign ba_uiinc ba_inc NULL ba dbaccess\source\ui\uno nmake - all ba_uiuno ba_uimisc ba_inc NULL ba dbaccess\source\ui\imagelists nmake - all ba_uiimglst ba_inc NULL -ba dbaccess\util nmake - all ba_util ba_uiimglst ba_capi ba_shared ba_uibrowser ba_uiapp ba_uicontrol ba_uidlg ba_uimisc ba_uiquery ba_uitabledesign ba_uirelationdesign ba_uiuno ba_conntools ba_misctools ba_miscres ba_ext_adabasui NULL +ba dbaccess\util nmake - all ba_util ba_uiimglst ba_capi ba_crecovery ba_shared ba_uibrowser ba_uiapp ba_uicontrol ba_uidlg ba_uimisc ba_uiquery ba_uitabledesign ba_uirelationdesign ba_uiuno ba_conntools ba_misctools ba_miscres ba_ext_adabasui NULL ba dbaccess\win32\source\odbcconfig nmake - w ba_odbcconfig ba_inc NULL ba dbaccess\qa\complex\dbaccess nmake - all ba_complex_tests NULL diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 64b667e89d14..c6b6db11a20c 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -41,7 +41,7 @@ #include "databasecontext.hxx" #include "documentcontainer.hxx" #include "sdbcoretools.hxx" -#include "dbdocrecovery.hxx" +#include "recovery/dbdocrecovery.hxx" /** === begin UNO includes === **/ #include <com/sun/star/beans/Optional.hpp> diff --git a/dbaccess/source/core/dataaccess/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx index 0bf44e2bf3e8..0bf44e2bf3e8 100644 --- a/dbaccess/source/core/dataaccess/dbdocrecovery.hxx +++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx diff --git a/dbaccess/source/core/dataaccess/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 2f2bdcd667d6..b22c19a07b6d 100644 --- a/dbaccess/source/core/dataaccess/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -25,7 +25,7 @@ #include "precompiled_dbaccess.hxx" -#include "dbdocrecovery.hxx" +#include "recovery/dbdocrecovery.hxx" #include "sdbcoretools.hxx" #include "dbastrings.hrc" diff --git a/dbaccess/source/core/recovery/makefile.mk b/dbaccess/source/core/recovery/makefile.mk new file mode 100644 index 000000000000..55c1211d80d4 --- /dev/null +++ b/dbaccess/source/core/recovery/makefile.mk @@ -0,0 +1,52 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.10.2.3 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/..$/.. +PRJINC=$(PRJ)$/source +PRJNAME=dbaccess +TARGET=recovery + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ---------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/dba.pmk + +# --- Files ------------------------------------- + +SLOFILES= \ + $(SLO)$/dbdocrecovery.obj + +# --- Targets ---------------------------------- + +.INCLUDE : target.mk + diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk index 7b6909992c53..622d6355b65d 100644 --- a/dbaccess/util/makefile.mk +++ b/dbaccess/util/makefile.mk @@ -50,6 +50,7 @@ LIB1TARGET=$(SLB)$/$(TARGET).lib LIB1FILES=\ $(SLB)$/api.lib \ $(SLB)$/dataaccess.lib \ + $(SLB)$/recovery.lib \ $(SLB)$/misc.lib \ $(SLB)$/core_resource.lib |