diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:52:21 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:52:21 +0200 |
commit | e70b1417d22d22e3d5bdffb1f4b55bc83a4c36ef (patch) | |
tree | 3bd3a7fe6854916ee1afa9ee042fc91b3fb9c24e /dbaccess/Library_dba.mk | |
parent | c00fe9ce1105c6c2a26954eeaee5e51336909a2a (diff) | |
parent | f1ea4ba4479f4a29eb0a42389d5f03c2ad280e8f (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
dbaccess/AllLangResTarget_adabasui.mk
dbaccess/AllLangResTarget_dba.mk
dbaccess/AllLangResTarget_dbmm.mk
dbaccess/AllLangResTarget_sdbt.mk
dbaccess/Executable_odbcconfig.mk
dbaccess/JunitTest_dbaccess_unoapi.mk
dbaccess/Library_adabasui.mk
dbaccess/Library_dba.mk
dbaccess/Library_dbaxml.mk
dbaccess/Library_dbmm.mk
dbaccess/Library_sdbt.mk
dbaccess/Makefile
dbaccess/Module_dbaccess.mk
dbaccess/Package_inc.mk
dbaccess/Package_uiconfig.mk
dbaccess/prj/build.lst
dbaccess/qa/unoapi/Test.java
dbaccess/source/core/api/CacheSet.hxx
dbaccess/source/core/dataaccess/SharedConnection.hxx
dbaccess/source/core/dataaccess/connection.cxx
dbaccess/source/filter/xml/xmlAutoStyle.cxx
dbaccess/source/filter/xml/xmlColumn.cxx
dbaccess/source/filter/xml/xmlComponent.cxx
dbaccess/source/filter/xml/xmlConnectionData.cxx
dbaccess/source/filter/xml/xmlConnectionResource.cxx
dbaccess/source/filter/xml/xmlDataSource.cxx
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
dbaccess/source/filter/xml/xmlDocuments.cxx
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
dbaccess/source/filter/xml/xmlHelper.cxx
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
dbaccess/source/filter/xml/xmlLogin.cxx
dbaccess/source/filter/xml/xmlQuery.cxx
dbaccess/source/filter/xml/xmlServerDatabase.cxx
dbaccess/source/filter/xml/xmlTable.cxx
dbaccess/source/filter/xml/xmlTableFilterList.cxx
dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx
dbaccess/source/ui/app/AppDetailView.cxx
dbaccess/source/ui/app/AppIconControl.cxx
dbaccess/source/ui/app/AppSwapWindow.cxx
dbaccess/source/ui/app/AppTitleWindow.cxx
dbaccess/source/ui/app/AppView.cxx
dbaccess/source/ui/browser/AsyncronousLink.cxx
dbaccess/source/ui/browser/genericcontroller.cxx
dbaccess/source/ui/control/ColumnControlWindow.cxx
dbaccess/source/ui/control/RelationControl.cxx
dbaccess/source/ui/control/SqlNameEdit.cxx
dbaccess/source/ui/control/TableGrantCtrl.cxx
dbaccess/source/ui/control/VertSplitView.cxx
dbaccess/source/ui/control/toolboxcontroller.cxx
dbaccess/source/ui/dlg/CollectionView.cxx
dbaccess/source/ui/dlg/ConnectionHelper.cxx
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
dbaccess/source/ui/dlg/RelationDlg.cxx
dbaccess/source/ui/dlg/TextConnectionHelper.cxx
dbaccess/source/ui/dlg/detailpages.cxx
dbaccess/source/ui/dlg/dlgsize.cxx
dbaccess/source/ui/dlg/queryorder.cxx
dbaccess/source/ui/dlg/tablespage.cxx
dbaccess/source/ui/misc/TableCopyHelper.cxx
dbaccess/source/ui/misc/ToolBoxHelper.cxx
dbaccess/source/ui/misc/WExtendPages.cxx
dbaccess/source/ui/misc/WNameMatch.cxx
dbaccess/source/ui/misc/WTypeSelect.cxx
dbaccess/source/ui/querydesign/ConnectionLine.cxx
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
dbaccess/source/ui/querydesign/ConnectionLineData.cxx
dbaccess/source/ui/querydesign/JAccess.cxx
dbaccess/source/ui/querydesign/JoinController.cxx
dbaccess/source/ui/querydesign/JoinDesignView.cxx
dbaccess/source/ui/querydesign/JoinExchange.cxx
dbaccess/source/ui/querydesign/JoinTableView.cxx
dbaccess/source/ui/querydesign/QTableConnection.cxx
dbaccess/source/ui/querydesign/QTableConnectionData.cxx
dbaccess/source/ui/querydesign/QTableWindow.cxx
dbaccess/source/ui/querydesign/QTableWindowData.cxx
dbaccess/source/ui/querydesign/QueryDesignView.cxx
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
dbaccess/source/ui/querydesign/QueryTextView.cxx
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
dbaccess/source/ui/querydesign/TableConnection.cxx
dbaccess/source/ui/querydesign/TableConnectionData.cxx
dbaccess/source/ui/querydesign/TableWindow.cxx
dbaccess/source/ui/querydesign/TableWindowAccess.cxx
dbaccess/source/ui/querydesign/TableWindowData.cxx
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
dbaccess/source/ui/querydesign/TableWindowTitle.cxx
dbaccess/source/ui/querydesign/querydlg.cxx
dbaccess/source/ui/querydesign/queryview.cxx
dbaccess/source/ui/relationdesign/RTableConnection.cxx
dbaccess/source/ui/relationdesign/RelationDesignView.cxx
dbaccess/source/ui/relationdesign/RelationTableView.cxx
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
dbaccess/source/ui/tabledesign/TEditControl.cxx
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
dbaccess/source/ui/tabledesign/TableDesignView.cxx
dbaccess/source/ui/tabledesign/TableFieldControl.cxx
dbaccess/source/ui/tabledesign/TableRow.cxx
dbaccess/source/ui/tabledesign/TableRowExchange.cxx
dbaccess/source/ui/tabledesign/TableUndo.cxx
dbaccess/source/ui/uno/ColumnControl.cxx
dbaccess/source/ui/uno/ColumnPeer.cxx
reportdesign/AllLangResTarget_rpt.mk
reportdesign/AllLangResTarget_rptui.mk
reportdesign/Library_rpt.mk
reportdesign/Library_rptui.mk
reportdesign/Library_rptxml.mk
reportdesign/Module_reportdesign.mk
reportdesign/Package_uiconfig.mk
reportdesign/Package_xml.mk
reportdesign/prj/build.lst
reportdesign/prj/makefile.mk
Diffstat (limited to 'dbaccess/Library_dba.mk')
-rw-r--r-- | dbaccess/Library_dba.mk | 260 |
1 files changed, 132 insertions, 128 deletions
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index dd6d101f8df1..368eaa192e4a 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -1,151 +1,155 @@ -#************************************************************************* +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. # -# OpenOffice.org - a multi-platform office productivity suite +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. # -# This file is part of OpenOffice.org. +# Major Contributor(s): # -# 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. +# For minor contributions see the git repository. # -# 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. -# -#************************************************************************* +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. $(eval $(call gb_Library_Library,dba)) -$(eval $(call gb_Library_add_package_headers,dba,dbaccess_inc)) -$(eval $(call gb_Library_add_precompiled_header,dba,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) -$(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba)) +$(eval $(call gb_Library_add_package_headers,dba,\ + dbaccess_inc \ +)) + +$(eval $(call gb_Library_add_precompiled_header,dba,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) $(eval $(call gb_Library_set_include,dba,\ - -I$(SRCDIR)/dbaccess/inc \ - -I$(SRCDIR)/dbaccess/source/core/inc \ - -I$(SRCDIR)/dbaccess/source/inc \ - -I$(SRCDIR)/dbaccess/inc/pch \ - $$(SOLARINC) \ - -I$(OUTDIR)/inc/offuh \ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ + -I$(realpath $(SRCDIR)/dbaccess/source/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_add_defs,dba,\ - -DOOO_DLLIMPLEMENTATION_DBA \ + -DOOO_DLLIMPLEMENTATION_DBA \ )) $(eval $(call gb_Library_add_linked_libs,dba,\ - sb \ - tl \ - svt \ - svl \ - cppuhelper \ - cppu \ - comphelper \ - dbtools \ - utl \ - vcl \ - sal \ - stl \ - i18nisolang1 \ - ucbhelper \ - sfx \ - salhelper \ - xo \ - fwe \ + comphelper \ + cppu \ + cppuhelper \ + dbtools \ + fwe \ + i18nisolang1 \ + sal \ + salhelper \ + sb \ + sfx \ + svl \ + svt \ + tl \ + ucbhelper \ + utl \ + vcl \ + xo \ $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba)) + $(eval $(call gb_Library_add_exception_objects,dba,\ - dbaccess/source/core/api/querydescriptor \ - dbaccess/source/core/api/FilteredContainer \ - dbaccess/source/core/api/TableDeco \ - dbaccess/source/core/api/RowSetCacheIterator \ - dbaccess/source/core/api/RowSet \ - dbaccess/source/core/api/column \ - dbaccess/source/core/api/RowSetBase \ - dbaccess/source/core/api/CRowSetDataColumn \ - dbaccess/source/core/api/CRowSetColumn \ - dbaccess/source/core/api/querycomposer \ - dbaccess/source/core/api/CIndexes \ - dbaccess/source/core/api/BookmarkSet \ - dbaccess/source/core/api/KeySet \ - dbaccess/source/core/api/StaticSet \ - dbaccess/source/core/api/CacheSet \ - dbaccess/source/core/api/RowSetCache \ - dbaccess/source/core/api/definitioncolumn \ - dbaccess/source/core/api/resultcolumn \ - dbaccess/source/core/api/datacolumn \ - dbaccess/source/core/api/resultset \ - dbaccess/source/core/api/statement \ - dbaccess/source/core/api/preparedstatement \ - dbaccess/source/core/api/callablestatement \ - dbaccess/source/core/api/query \ - dbaccess/source/core/api/querycontainer \ - dbaccess/source/core/api/table \ - dbaccess/source/core/api/viewcontainer \ - dbaccess/source/core/api/tablecontainer \ - dbaccess/source/core/api/SingleSelectQueryComposer \ - dbaccess/source/core/api/HelperCollections \ - dbaccess/source/core/api/datasettings \ - dbaccess/source/core/api/View \ - dbaccess/source/core/api/WrappedResultSet \ - dbaccess/source/core/api/OptimisticSet \ - dbaccess/source/core/api/PrivateRow \ - dbaccess/source/core/api/columnsettings \ - dbaccess/source/core/dataaccess/SharedConnection \ - dbaccess/source/core/dataaccess/ContentHelper \ - dbaccess/source/core/dataaccess/bookmarkcontainer \ - dbaccess/source/core/dataaccess/definitioncontainer \ - dbaccess/source/core/dataaccess/commanddefinition \ - dbaccess/source/core/dataaccess/documentcontainer \ - dbaccess/source/core/dataaccess/commandcontainer \ - dbaccess/source/core/dataaccess/documentdefinition \ - dbaccess/source/core/dataaccess/ComponentDefinition \ - dbaccess/source/core/dataaccess/databasecontext \ - dbaccess/source/core/dataaccess/connection \ - dbaccess/source/core/dataaccess/datasource \ - dbaccess/source/core/dataaccess/databaseregistrations \ - dbaccess/source/core/dataaccess/intercept \ - dbaccess/source/core/dataaccess/myucp_datasupplier \ - dbaccess/source/core/dataaccess/myucp_resultset \ - dbaccess/source/core/dataaccess/databasedocument \ - dbaccess/source/core/dataaccess/dataaccessdescriptor \ - dbaccess/source/core/dataaccess/ModelImpl \ - dbaccess/source/core/dataaccess/documentevents \ - dbaccess/source/core/dataaccess/documenteventexecutor \ - dbaccess/source/core/dataaccess/documenteventnotifier \ - dbaccess/source/core/misc/sdbcoretools \ - dbaccess/source/core/misc/services \ - dbaccess/source/core/misc/PropertyForward \ - dbaccess/source/core/misc/ContainerMediator \ - dbaccess/source/core/misc/userinformation \ - dbaccess/source/core/misc/ContainerListener \ - dbaccess/source/core/misc/objectnameapproval \ - dbaccess/source/core/misc/DatabaseDataProvider \ - dbaccess/source/core/misc/module_dba \ - dbaccess/source/core/misc/dsntypes \ - dbaccess/source/core/misc/veto \ - dbaccess/source/core/misc/apitools \ - dbaccess/source/core/misc/dbastrings \ - dbaccess/source/core/recovery/dbdocrecovery \ - dbaccess/source/core/recovery/subcomponentloader \ - dbaccess/source/core/recovery/storagestream \ - dbaccess/source/core/recovery/storagexmlstream \ - dbaccess/source/core/recovery/storagetextstream \ - dbaccess/source/core/recovery/subcomponentrecovery \ - dbaccess/source/core/recovery/settingsimport \ - dbaccess/source/core/resource/core_resource \ + dbaccess/source/core/api/BookmarkSet \ + dbaccess/source/core/api/CacheSet \ + dbaccess/source/core/api/callablestatement \ + dbaccess/source/core/api/CIndexes \ + dbaccess/source/core/api/column \ + dbaccess/source/core/api/columnsettings \ + dbaccess/source/core/api/CRowSetColumn \ + dbaccess/source/core/api/CRowSetDataColumn \ + dbaccess/source/core/api/datacolumn \ + dbaccess/source/core/api/datasettings \ + dbaccess/source/core/api/definitioncolumn \ + dbaccess/source/core/api/FilteredContainer \ + dbaccess/source/core/api/HelperCollections \ + dbaccess/source/core/api/KeySet \ + dbaccess/source/core/api/OptimisticSet \ + dbaccess/source/core/api/preparedstatement \ + dbaccess/source/core/api/PrivateRow \ + dbaccess/source/core/api/query \ + dbaccess/source/core/api/querycomposer \ + dbaccess/source/core/api/querycontainer \ + dbaccess/source/core/api/querydescriptor \ + dbaccess/source/core/api/resultcolumn \ + dbaccess/source/core/api/resultset \ + dbaccess/source/core/api/RowSet \ + dbaccess/source/core/api/RowSetBase \ + dbaccess/source/core/api/RowSetCache \ + dbaccess/source/core/api/RowSetCacheIterator \ + dbaccess/source/core/api/SingleSelectQueryComposer \ + dbaccess/source/core/api/statement \ + dbaccess/source/core/api/StaticSet \ + dbaccess/source/core/api/table \ + dbaccess/source/core/api/tablecontainer \ + dbaccess/source/core/api/TableDeco \ + dbaccess/source/core/api/View \ + dbaccess/source/core/api/viewcontainer \ + dbaccess/source/core/api/WrappedResultSet \ + dbaccess/source/core/dataaccess/bookmarkcontainer \ + dbaccess/source/core/dataaccess/commandcontainer \ + dbaccess/source/core/dataaccess/commanddefinition \ + dbaccess/source/core/dataaccess/ComponentDefinition \ + dbaccess/source/core/dataaccess/connection \ + dbaccess/source/core/dataaccess/ContentHelper \ + dbaccess/source/core/dataaccess/dataaccessdescriptor \ + dbaccess/source/core/dataaccess/databasecontext \ + dbaccess/source/core/dataaccess/databasedocument \ + dbaccess/source/core/dataaccess/databaseregistrations \ + dbaccess/source/core/dataaccess/datasource \ + dbaccess/source/core/dataaccess/definitioncontainer \ + dbaccess/source/core/dataaccess/documentcontainer \ + dbaccess/source/core/dataaccess/documentdefinition \ + dbaccess/source/core/dataaccess/documenteventexecutor \ + dbaccess/source/core/dataaccess/documenteventnotifier \ + dbaccess/source/core/dataaccess/documentevents \ + dbaccess/source/core/dataaccess/intercept \ + dbaccess/source/core/dataaccess/ModelImpl \ + dbaccess/source/core/dataaccess/myucp_datasupplier \ + dbaccess/source/core/dataaccess/myucp_resultset \ + dbaccess/source/core/dataaccess/SharedConnection \ + dbaccess/source/core/misc/apitools \ + dbaccess/source/core/misc/ContainerListener \ + dbaccess/source/core/misc/ContainerMediator \ + dbaccess/source/core/misc/DatabaseDataProvider \ + dbaccess/source/core/misc/dbastrings \ + dbaccess/source/core/misc/dsntypes \ + dbaccess/source/core/misc/module_dba \ + dbaccess/source/core/misc/objectnameapproval \ + dbaccess/source/core/misc/PropertyForward \ + dbaccess/source/core/misc/sdbcoretools \ + dbaccess/source/core/misc/services \ + dbaccess/source/core/misc/userinformation \ + dbaccess/source/core/misc/veto \ + dbaccess/source/core/recovery/dbdocrecovery \ + dbaccess/source/core/recovery/settingsimport \ + dbaccess/source/core/recovery/storagestream \ + dbaccess/source/core/recovery/storagetextstream \ + dbaccess/source/core/recovery/storagexmlstream \ + dbaccess/source/core/recovery/subcomponentloader \ + dbaccess/source/core/recovery/subcomponentrecovery \ + dbaccess/source/core/resource/core_resource \ )) -# vim: set noet sw=4 ts=4: +# vim: set noet ts=4 sw=4: |