[Libreoffice-commits] .: 3 commits - dbaccess/AllLangResTarget_adabasui.mk dbaccess/AllLangResTarget_dba.mk dbaccess/AllLangResTarget_dbmm.mk dbaccess/AllLangResTarget_dbu.mk dbaccess/AllLangResTarget_sdbt.mk dbaccess/Executable_odbcconfig.mk dbaccess/inc dbaccess/Library_adabasui.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk dbaccess/Module_dbaccess.mk dbaccess/Package_inc.mk dbaccess/Package_uiconfig.mk dbaccess/prj dbaccess/source dbaccess/util dbaccess/win32
David Tardon
dtardon at kemper.freedesktop.org
Mon Apr 18 22:05:50 PDT 2011
dbaccess/AllLangResTarget_adabasui.mk | 48 +++
dbaccess/AllLangResTarget_dba.mk | 48 +++
dbaccess/AllLangResTarget_dbmm.mk | 47 +++
dbaccess/AllLangResTarget_dbu.mk | 95 +++++++
dbaccess/AllLangResTarget_sdbt.mk | 47 +++
dbaccess/Executable_odbcconfig.mk | 38 ++
dbaccess/Library_adabasui.mk | 72 +++++
dbaccess/Library_dba.mk | 156 +++++++++++
dbaccess/Library_dbaxml.mk | 93 ++++++
dbaccess/Library_dbmm.mk | 77 +++++
dbaccess/Library_dbu.mk | 322 ++++++++++++++++++++++++
dbaccess/Library_sdbt.mk | 67 ++++
dbaccess/Module_dbaccess.mk | 15 +
dbaccess/Package_inc.mk | 41 +++
dbaccess/Package_uiconfig.mk | 50 +++
dbaccess/inc/makefile.mk | 47 ---
dbaccess/prj/makefile.mk | 40 ++
dbaccess/source/core/api/makefile.mk | 82 ------
dbaccess/source/core/dataaccess/makefile.mk | 69 -----
dbaccess/source/core/misc/makefile.mk | 60 ----
dbaccess/source/core/misc/services.cxx | 4
dbaccess/source/core/recovery/makefile.mk | 54 ----
dbaccess/source/core/resource/makefile.mk | 51 ---
dbaccess/source/ext/adabas/makefile.mk | 100 -------
dbaccess/source/ext/macromigration/makefile.mk | 109 --------
dbaccess/source/filter/xml/makefile.mk | 121 ---------
dbaccess/source/filter/xml/xmlservices.cxx | 4
dbaccess/source/sdbtools/connection/makefile.mk | 49 ---
dbaccess/source/sdbtools/misc/makefile.mk | 47 ---
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 4
dbaccess/source/sdbtools/resource/makefile.mk | 45 ---
dbaccess/source/shared/makefile.mk | 67 ----
dbaccess/source/ui/app/makefile.mk | 69 -----
dbaccess/source/ui/browser/makefile.mk | 71 -----
dbaccess/source/ui/control/makefile.mk | 78 -----
dbaccess/source/ui/dlg/makefile.mk | 154 -----------
dbaccess/source/ui/imagelists/makefile.mk | 49 ---
dbaccess/source/ui/inc/makefile.mk | 43 ---
dbaccess/source/ui/misc/makefile.mk | 88 ------
dbaccess/source/ui/misc/uiservices.cxx | 4
dbaccess/source/ui/querydesign/makefile.mk | 89 ------
dbaccess/source/ui/relationdesign/makefile.mk | 58 ----
dbaccess/source/ui/tabledesign/makefile.mk | 65 ----
dbaccess/source/ui/uno/makefile.mk | 76 -----
dbaccess/util/makefile.mk | 262 -------------------
dbaccess/win32/source/odbcconfig/makefile.mk | 54 ----
46 files changed, 1264 insertions(+), 2065 deletions(-)
New commits:
commit e1ec9aa63352dde90976f57b907c199d239499ef
Author: David Tardon <dtardon at redhat.com>
Date: Tue Apr 19 06:54:38 2011 +0200
fix deps
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 105b1be..47b58c9 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -309,4 +309,14 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
))
endif
+$(foreach object,\
+ dbaccess/source/ui/dlg/ConnectionHelper \
+ dbaccess/source/ui/dlg/ConnectionPage \
+ dbaccess/source/ui/dlg/ConnectionPageSetup \
+ dbaccess/source/ui/dlg/DBSetupConnectionPages \
+ dbaccess/source/ui/dlg/detailpages \
+ dbaccess/source/ui/dlg/tablespage \
+ dbaccess/source/ui/dlg/TextConnectionHelper \
+ ,$(eval $(call gb_CxxObject_get_target,$(object)) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc))
+
# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 741f1af..62e59b4 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -46,6 +46,4 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
JunitTest_dbaccess_unoapi \
))
-$(call $(gb_Library_get_target,dbu)) :| $(call $(gb_SrsTemplateTarget_get_target,dbaccess/dbu))
-
# vim: set noet ts=4 sw=4:
commit 8f100408c630787950ad1aac7f3ef6ef94ac9843
Author: David Tardon <dtardon at redhat.com>
Date: Tue Apr 19 06:14:23 2011 +0200
use SAL_DLLPUBLIC_EXPORT for consistency
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index 7b33c2a..a631150 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -85,7 +85,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBA()
//---------------------------------------------------------------------------------------
-extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char **ppEnvTypeName,
uno_Environment **
)
@@ -95,7 +95,7 @@ extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironmen
}
//---------------------------------------------------------------------------------------
-extern "C" OOO_DLLPUBLIC_DBA void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* pRegistryKey)
diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx
index dfba568..5a3eb62 100644
--- a/dbaccess/source/ui/misc/uiservices.cxx
+++ b/dbaccess/source/ui/misc/uiservices.cxx
@@ -108,7 +108,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBU()
//---------------------------------------------------------------------------------------
-extern "C" DBACCESS_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char **ppEnvTypeName,
uno_Environment **
)
@@ -118,7 +118,7 @@ extern "C" DBACCESS_DLLPUBLIC void SAL_CALL component_getImplementationEnvironme
}
//---------------------------------------------------------------------------------------
-extern "C" DBACCESS_DLLPUBLIC void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
commit 5174b8515175df2fef130bc2e8d12e780782a81e
Author: David Tardon <dtardon at redhat.com>
Date: Mon Apr 18 14:46:56 2011 +0200
gbuildize dbaccess
diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk
new file mode 100644
index 0000000..17ff9fc
--- /dev/null
+++ b/dbaccess/AllLangResTarget_adabasui.mk
@@ -0,0 +1,48 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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_AllLangResTarget_AllLangResTarget,adabasui))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,adabasui,dbaccess))
+
+$(eval $(call gb_AllLangResTarget_add_srs,adabasui,\
+ dbaccess/adabasui \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/adabasui))
+
+$(eval $(call gb_SrsTarget_set_include,dbaccess/adabasui,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/dbaccess/inc) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbaccess/adabasui,\
+ dbaccess/source/ext/adabas/AdabasNewDb.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk
new file mode 100644
index 0000000..7c2d730
--- /dev/null
+++ b/dbaccess/AllLangResTarget_dba.mk
@@ -0,0 +1,48 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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_AllLangResTarget_AllLangResTarget,dba))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,dba,dbaccess))
+
+$(eval $(call gb_AllLangResTarget_add_srs,dba,\
+ dbaccess/dba \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba))
+
+$(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbaccess/dba,\
+ dbaccess/source/core/resource/strings.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk
new file mode 100644
index 0000000..6c233d0
--- /dev/null
+++ b/dbaccess/AllLangResTarget_dbmm.mk
@@ -0,0 +1,47 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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_AllLangResTarget_AllLangResTarget,dbmm))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,dbmm,dbaccess))
+
+$(eval $(call gb_AllLangResTarget_add_srs,dbmm,\
+ dbaccess/dbmm \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm))
+
+$(eval $(call gb_SrsTarget_set_include,dbaccess/dbmm,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\
+ dbaccess/source/ext/macromigration/macromigration.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
new file mode 100644
index 0000000..fc7fbe1
--- /dev/null
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -0,0 +1,95 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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_AllLangResTarget_AllLangResTarget,dbu))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,dbu,dbaccess))
+
+$(eval $(call gb_AllLangResTarget_add_srs,dbu,\
+ dbaccess/dbu \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu))
+
+$(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc/dbaccess \
+ -I$(realpath $(SRCDIR)/dbaccess/inc) \
+ -I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
+ dbaccess/source/ui/app/app.src \
+ dbaccess/source/ui/browser/sbabrw.src \
+ dbaccess/source/ui/browser/sbagrid.src \
+ dbaccess/source/ui/control/TableGrantCtrl.src \
+ dbaccess/source/ui/control/tabletree.src \
+ dbaccess/source/ui/control/undosqledit.src \
+ dbaccess/source/ui/dlg/AdabasStat.src \
+ dbaccess/source/ui/dlg/admincontrols.src \
+ dbaccess/source/ui/dlg/adtabdlg.src \
+ dbaccess/source/ui/dlg/advancedsettings.src \
+ dbaccess/source/ui/dlg/AutoControls.src \
+ dbaccess/source/ui/dlg/CollectionView.src \
+ dbaccess/source/ui/dlg/ConnectionPage.src \
+ dbaccess/source/ui/dlg/dbadmin2.src \
+ dbaccess/source/ui/dlg/dbadminsetup.src \
+ dbaccess/source/ui/dlg/dbadmin.src \
+ dbaccess/source/ui/dlg/dbfindex.src \
+ dbaccess/source/ui/dlg/directsql.src \
+ dbaccess/source/ui/dlg/dlgattr.src \
+ dbaccess/source/ui/dlg/dlgsave.src \
+ dbaccess/source/ui/dlg/dlgsize.src \
+ dbaccess/source/ui/dlg/dsselect.src \
+ dbaccess/source/ui/dlg/indexdialog.src \
+ dbaccess/source/ui/dlg/paramdialog.src \
+ dbaccess/source/ui/dlg/queryfilter.src \
+ dbaccess/source/ui/dlg/queryorder.src \
+ dbaccess/source/ui/dlg/RelationDlg.src \
+ dbaccess/source/ui/dlg/sqlmessage.src \
+ dbaccess/source/ui/dlg/textconnectionsettings.src \
+ dbaccess/source/ui/dlg/UserAdminDlg.src \
+ dbaccess/source/ui/dlg/UserAdmin.src \
+ dbaccess/source/ui/imagelists/dbimagelists.src \
+ dbaccess/source/ui/misc/dbumiscres.src \
+ dbaccess/source/ui/misc/WizardPages.src \
+ dbaccess/source/ui/querydesign/querydlg.src \
+ dbaccess/source/ui/querydesign/query.src \
+ dbaccess/source/ui/relationdesign/relation.src \
+ dbaccess/source/ui/tabledesign/table.src \
+ dbaccess/source/ui/uno/copytablewizard.src \
+ dbaccess/source/ui/uno/dbinteraction.src \
+))
+
+$(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\
+ dbaccess/source/ui/dlg/AutoControls_tmpl.hrc \
+ dbaccess/source/ui/inc/toolbox_tmpl.hrc \
+))
+
+$(call gb_SrsTarget_get_target,dbaccess/dbu) :| $(OUTDIR)/inc/svx/globlmn.hrc
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk
new file mode 100644
index 0000000..208e188
--- /dev/null
+++ b/dbaccess/AllLangResTarget_sdbt.mk
@@ -0,0 +1,47 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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_AllLangResTarget_AllLangResTarget,sdbt))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,sdbt,dbaccess))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sdbt,\
+ dbaccess/sdbt \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/sdbt))
+
+$(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbaccess/sdbt,\
+ dbaccess/source/sdbtools/resource/sdbt_strings.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
new file mode 100644
index 0000000..b6bdf3c
--- /dev/null
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -0,0 +1,38 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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_Executable_Executable,odbcconfig))
+
+$(eval $(call gb_Executable_add_linked_libs,odbcconfig,\
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,odbcconfig,\
+ dbaccess/win32/source/odbcconfig/odbcconfig \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
new file mode 100644
index 0000000..ee5ae6a
--- /dev/null
+++ b/dbaccess/Library_adabasui.mk
@@ -0,0 +1,72 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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,adabasui))
+
+$(eval $(call gb_Library_add_precompiled_header,adabasui,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess))
+
+$(eval $(call gb_Library_set_include,adabasui,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,adabasui,\
+ $$(DEFS) \
+ -DCOMPMOD_NAMESPACE=adabasui \
+))
+
+$(eval $(call gb_Library_add_linked_libs,adabasui,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ dbtools \
+ sal \
+ sfx \
+ svl \
+ svt \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,adabasui,dbaccess/source/ext/adabas/adabasui))
+
+$(eval $(call gb_Library_add_exception_objects,adabasui,\
+ dbaccess/source/ext/adabas/Acomponentmodule \
+ dbaccess/source/ext/adabas/AdabasNewDb \
+ dbaccess/source/ext/adabas/adabasuistrings \
+ dbaccess/source/ext/adabas/ANewDb \
+ dbaccess/source/ext/adabas/Aservices \
+ dbaccess/source/ext/adabas/ASqlNameEdit \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
new file mode 100644
index 0000000..fdd5754
--- /dev/null
+++ b/dbaccess/Library_dba.mk
@@ -0,0 +1,156 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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_include,dba,\
+ $$(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_set_defs,dba,\
+ $$(DEFS) \
+ -DOOO_DLLIMPLEMENTATION_DBA \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dba,\
+ 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/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 ts=4 sw=4:
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
new file mode 100644
index 0000000..e0a1908
--- /dev/null
+++ b/dbaccess/Library_dbaxml.mk
@@ -0,0 +1,93 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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,dbaxml))
+
+$(eval $(call gb_Library_add_precompiled_header,dbaxml,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess))
+
+$(eval $(call gb_Library_set_include,dbaxml,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
+ -I$(realpath $(SRCDIR)/dbaccess/source/inc) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbaxml,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ dba \
+ dbtools \
+ sal \
+ sfx \
+ svl \
+ tk \
+ tl \
+ utl \
+ vcl \
+ xo \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml))
+
+$(eval $(call gb_Library_add_exception_objects,dbaxml,\
+ dbaccess/source/filter/xml/dbloader2 \
+ dbaccess/source/filter/xml/xmlAutoStyle \
+ dbaccess/source/filter/xml/xmlColumn \
+ dbaccess/source/filter/xml/xmlComponent \
+ dbaccess/source/filter/xml/xmlConnectionData \
+ dbaccess/source/filter/xml/xmlConnectionResource \
+ dbaccess/source/filter/xml/xmlDatabase \
+ dbaccess/source/filter/xml/xmlDatabaseDescription \
+ dbaccess/source/filter/xml/xmlDataSource \
+ dbaccess/source/filter/xml/xmlDataSourceInfo \
+ dbaccess/source/filter/xml/xmlDataSourceSetting \
+ dbaccess/source/filter/xml/xmlDataSourceSettings \
+ dbaccess/source/filter/xml/xmlDocuments \
+ dbaccess/source/filter/xml/xmlExport \
+ dbaccess/source/filter/xml/xmlFileBasedDatabase \
+ dbaccess/source/filter/xml/xmlfilter \
+ dbaccess/source/filter/xml/xmlHelper \
+ dbaccess/source/filter/xml/xmlHierarchyCollection \
+ dbaccess/source/filter/xml/xmlLogin \
+ dbaccess/source/filter/xml/xmlQuery \
+ dbaccess/source/filter/xml/xmlServerDatabase \
+ dbaccess/source/filter/xml/xmlservices \
+ dbaccess/source/filter/xml/xmlStyleImport \
+ dbaccess/source/filter/xml/xmlTable \
+ dbaccess/source/filter/xml/xmlTableFilterList \
+ dbaccess/source/filter/xml/xmlTableFilterPattern \
+ dbaccess/source/shared/flt_reghelper \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,dbaxml,\
+ dbaccess/source/shared/xmlstrings \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
new file mode 100644
index 0000000..db6b152
--- /dev/null
+++ b/dbaccess/Library_dbmm.mk
@@ -0,0 +1,77 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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,dbmm))
+
+$(eval $(call gb_Library_add_package_headers,dbmm,\
+ dbaccess_inc \
+))
+
+$(eval $(call gb_Library_add_precompiled_header,dbmm,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess))
+
+$(eval $(call gb_Library_set_include,dbmm,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/dbaccess/inc) \
+ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbmm,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ svl \
+ svt \
+ svxcore \
+ svx \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ xcr \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm))
+
+$(eval $(call gb_Library_add_exception_objects,dbmm,\
+ dbaccess/source/ext/macromigration/dbmm_module \
+ dbaccess/source/ext/macromigration/dbmm_services \
+ dbaccess/source/ext/macromigration/dbmm_types \
+ dbaccess/source/ext/macromigration/docinteraction \
+ dbaccess/source/ext/macromigration/macromigrationdialog \
+ dbaccess/source/ext/macromigration/macromigrationpages \
+ dbaccess/source/ext/macromigration/macromigrationwizard \
+ dbaccess/source/ext/macromigration/migrationengine \
+ dbaccess/source/ext/macromigration/migrationlog \
+ dbaccess/source/ext/macromigration/progresscapture \
+ dbaccess/source/ext/macromigration/progressmixer \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
new file mode 100644
index 0000000..105b1be
--- /dev/null
+++ b/dbaccess/Library_dbu.mk
@@ -0,0 +1,312 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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,dbu))
+
+$(eval $(call gb_Library_add_precompiled_header,dbu,$(SRCDIR)/chart2/inc/pch/precompiled_chart2))
+
+$(eval $(call gb_Library_set_include,dbu,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/dbaccess/inc) \
+ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
+ -I$(realpath $(SRCDIR)/dbaccess/source/inc) \
+ -I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \
+ -I$(WORKDIR)/inc/dbaccess \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,dbu,\
+ $$(DEFS) \
+ -DDBACCESS_DLLIMPLEMENTATION \
+ $(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \
+))
+
+ifneq (,$(strip $(WINDOWS_VISTA_PSDK)))
+ifeq (,$(strip $(PROF_EDITION)))
+$(eval $(call gb_Library_set_defs,dbu,\
+ $$(DEFS) \
+ -DWINDOWS_VISTA_PSDK \
+))
+endif
+endif
+
+ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h
+$(eval $(call gb_Library_set_cflags,dbu,\
+ $$(CFLAGS) \
+ -fpermissive \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,dbu,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ dba \
+ dbtools \
+ editeng \
+ fwe \
+ sal \
+ salhelper \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svxcore \
+ svx \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,dbu,\
+ ole32 \
+ oleaut32 \
+ uuid \
+))
+endif
+
+$(eval $(call gb_Library_set_componentfile,dbu,dbaccess/util/dbu))
+
+$(eval $(call gb_Library_add_exception_objects,dbu,\
+ dbaccess/source/shared/dbu_reghelper \
+ dbaccess/source/ui/app/AppController \
+ dbaccess/source/ui/app/AppControllerDnD \
+ dbaccess/source/ui/app/AppControllerGen \
+ dbaccess/source/ui/app/AppDetailPageHelper \
+ dbaccess/source/ui/app/AppDetailView \
+ dbaccess/source/ui/app/AppIconControl \
+ dbaccess/source/ui/app/AppSwapWindow \
+ dbaccess/source/ui/app/AppTitleWindow \
+ dbaccess/source/ui/app/AppView \
+ dbaccess/source/ui/app/subcomponentmanager \
+ dbaccess/source/ui/browser/AsyncronousLink \
+ dbaccess/source/ui/browser/brwctrlr \
+ dbaccess/source/ui/browser/brwview \
+ dbaccess/source/ui/browser/dataview \
+ dbaccess/source/ui/browser/dbexchange \
+ dbaccess/source/ui/browser/dbloader \
+ dbaccess/source/ui/browser/dbtreemodel \
+ dbaccess/source/ui/browser/dbtreeview \
+ dbaccess/source/ui/browser/dsbrowserDnD \
+ dbaccess/source/ui/browser/dsEntriesNoExp \
+ dbaccess/source/ui/browser/exsrcbrw \
+ dbaccess/source/ui/browser/formadapter \
+ dbaccess/source/ui/browser/genericcontroller \
+ dbaccess/source/ui/browser/sbagrid \
+ dbaccess/source/ui/browser/sbamultiplex \
+ dbaccess/source/ui/browser/unodatbr \
+ dbaccess/source/ui/control/charsetlistbox \
+ dbaccess/source/ui/control/ColumnControlWindow \
+ dbaccess/source/ui/control/curledit \
+ dbaccess/source/ui/control/dbtreelistbox \
+ dbaccess/source/ui/control/FieldDescControl \
+ dbaccess/source/ui/control/listviewitems \
+ dbaccess/source/ui/control/marktree \
+ dbaccess/source/ui/control/opendoccontrols \
+ dbaccess/source/ui/control/RelationControl \
+ dbaccess/source/ui/control/sqledit \
+ dbaccess/source/ui/control/SqlNameEdit \
+ dbaccess/source/ui/control/statusbarontroller \
+ dbaccess/source/ui/control/TableGrantCtrl \
+ dbaccess/source/ui/control/tabletree \
+ dbaccess/source/ui/control/toolboxcontroller \
+ dbaccess/source/ui/control/undosqledit \
+ dbaccess/source/ui/control/VertSplitView \
+ dbaccess/source/ui/dlg/AdabasStat \
+ dbaccess/source/ui/dlg/admincontrols \
+ dbaccess/source/ui/dlg/adminpages \
+ dbaccess/source/ui/dlg/adtabdlg \
+ dbaccess/source/ui/dlg/advancedsettings \
+ dbaccess/source/ui/dlg/CollectionView \
+ dbaccess/source/ui/dlg/ConnectionHelper \
+ dbaccess/source/ui/dlg/ConnectionPage \
+ dbaccess/source/ui/dlg/ConnectionPageSetup \
+ dbaccess/source/ui/dlg/dbadmin \
+ dbaccess/source/ui/dlg/DbAdminImpl \
+ dbaccess/source/ui/dlg/dbfindex \
+ dbaccess/source/ui/dlg/DBSetupConnectionPages \
+ dbaccess/source/ui/dlg/dbwiz \
+ dbaccess/source/ui/dlg/dbwizsetup \
+ dbaccess/source/ui/dlg/detailpages \
+ dbaccess/source/ui/dlg/directsql \
+ dbaccess/source/ui/dlg/dlgattr \
+ dbaccess/source/ui/dlg/dlgsave \
+ dbaccess/source/ui/dlg/dlgsize \
+ dbaccess/source/ui/dlg/DriverSettings \
+ dbaccess/source/ui/dlg/dsselect \
+ dbaccess/source/ui/dlg/finteraction \
+ dbaccess/source/ui/dlg/generalpage \
+ dbaccess/source/ui/dlg/indexdialog \
+ dbaccess/source/ui/dlg/indexfieldscontrol \
+ dbaccess/source/ui/dlg/odbcconfig \
+ dbaccess/source/ui/dlg/paramdialog \
+ dbaccess/source/ui/dlg/queryfilter \
+ dbaccess/source/ui/dlg/queryorder \
+ dbaccess/source/ui/dlg/RelationDlg \
+ dbaccess/source/ui/dlg/sqlmessage \
+ dbaccess/source/ui/dlg/tablespage \
+ dbaccess/source/ui/dlg/TablesSingleDlg \
+ dbaccess/source/ui/dlg/TextConnectionHelper \
+ dbaccess/source/ui/dlg/textconnectionsettings \
+ dbaccess/source/ui/dlg/UserAdmin \
+ dbaccess/source/ui/dlg/UserAdminDlg \
+ dbaccess/source/ui/misc/asyncmodaldialog \
+ dbaccess/source/ui/misc/charsets \
+ dbaccess/source/ui/misc/controllerframe \
+ dbaccess/source/ui/misc/databaseobjectview \
+ dbaccess/source/ui/misc/datasourceconnector \
+ dbaccess/source/ui/misc/dbaundomanager \
+ dbaccess/source/ui/misc/dbsubcomponentcontroller \
+ dbaccess/source/ui/misc/defaultobjectnamecheck \
+ dbaccess/source/ui/misc/DExport \
+ dbaccess/source/ui/misc/dsmeta \
+ dbaccess/source/ui/misc/HtmlReader \
+ dbaccess/source/ui/misc/imageprovider \
+ dbaccess/source/ui/misc/indexcollection \
+ dbaccess/source/ui/misc/linkeddocuments \
+ dbaccess/source/ui/misc/moduledbu \
+ dbaccess/source/ui/misc/propertysetitem \
+ dbaccess/source/ui/misc/propertystorage \
+ dbaccess/source/ui/misc/RowSetDrop \
+ dbaccess/source/ui/misc/RtfReader \
+ dbaccess/source/ui/misc/singledoccontroller \
+ dbaccess/source/ui/misc/stringlistitem \
+ dbaccess/source/ui/misc/TableCopyHelper \
+ dbaccess/source/ui/misc/TokenWriter \
+ dbaccess/source/ui/misc/ToolBoxHelper \
+ dbaccess/source/ui/misc/uiservices \
+ dbaccess/source/ui/misc/UITools \
+ dbaccess/source/ui/misc/WColumnSelect \
+ dbaccess/source/ui/misc/WCopyTable \
+ dbaccess/source/ui/misc/WCPage \
+ dbaccess/source/ui/misc/WExtendPages \
+ dbaccess/source/ui/misc/WNameMatch \
+ dbaccess/source/ui/misc/WTypeSelect \
+ dbaccess/source/ui/querydesign/ConnectionLine \
+ dbaccess/source/ui/querydesign/ConnectionLineAccess \
+ dbaccess/source/ui/querydesign/JAccess \
+ dbaccess/source/ui/querydesign/JoinController \
+ dbaccess/source/ui/querydesign/JoinDesignView \
+ dbaccess/source/ui/querydesign/JoinExchange \
+ dbaccess/source/ui/querydesign/JoinTableView \
+ dbaccess/source/ui/querydesign/QTableConnection \
+ dbaccess/source/ui/querydesign/QTableConnectionData \
+ dbaccess/source/ui/querydesign/QTableWindow \
+ dbaccess/source/ui/querydesign/QTableWindowData \
+ dbaccess/source/ui/querydesign/querycontainerwindow \
+ dbaccess/source/ui/querydesign/querycontroller \
+ dbaccess/source/ui/querydesign/QueryDesignView \
+ dbaccess/source/ui/querydesign/querydlg \
+ dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct \
+ dbaccess/source/ui/querydesign/QueryTabConnUndoAction \
+ dbaccess/source/ui/querydesign/QueryTableView \
+ dbaccess/source/ui/querydesign/QueryTabWinUndoAct \
+ dbaccess/source/ui/querydesign/QueryTextView \
+ dbaccess/source/ui/querydesign/queryview \
+ dbaccess/source/ui/querydesign/QueryViewSwitch \
+ dbaccess/source/ui/querydesign/SelectionBrowseBox \
+ dbaccess/source/ui/querydesign/TableConnection \
+ dbaccess/source/ui/querydesign/TableConnectionData \
+ dbaccess/source/ui/querydesign/TableFieldDescription \
+ dbaccess/source/ui/querydesign/TableWindow \
+ dbaccess/source/ui/querydesign/TableWindowAccess \
+ dbaccess/source/ui/querydesign/TableWindowData \
+ dbaccess/source/ui/querydesign/TableWindowListBox \
+ dbaccess/source/ui/querydesign/TableWindowTitle \
+ dbaccess/source/ui/relationdesign/RelationController \
+ dbaccess/source/ui/relationdesign/RelationDesignView \
+ dbaccess/source/ui/relationdesign/RelationTableView \
+ dbaccess/source/ui/relationdesign/RTableConnection \
+ dbaccess/source/ui/relationdesign/RTableConnectionData \
+ dbaccess/source/ui/tabledesign/FieldDescGenWin \
+ dbaccess/source/ui/tabledesign/FieldDescriptions \
+ dbaccess/source/ui/tabledesign/TableController \
+ dbaccess/source/ui/tabledesign/TableDesignControl \
+ dbaccess/source/ui/tabledesign/TableDesignHelpBar \
+ dbaccess/source/ui/tabledesign/TableDesignView \
+ dbaccess/source/ui/tabledesign/TableFieldControl \
+ dbaccess/source/ui/tabledesign/TableFieldDescWin \
+ dbaccess/source/ui/tabledesign/TableRow \
+ dbaccess/source/ui/tabledesign/TableRowExchange \
+ dbaccess/source/ui/tabledesign/TableUndo \
+ dbaccess/source/ui/tabledesign/TEditControl \
+ dbaccess/source/ui/uno/admindlg \
+ dbaccess/source/ui/uno/AdvancedSettingsDlg \
+ dbaccess/source/ui/uno/ColumnControl \
+ dbaccess/source/ui/uno/ColumnModel \
+ dbaccess/source/ui/uno/ColumnPeer \
+ dbaccess/source/ui/uno/composerdialogs \
+ dbaccess/source/ui/uno/dbinteraction \
+ dbaccess/source/ui/uno/DBTypeWizDlg \
+ dbaccess/source/ui/uno/DBTypeWizDlgSetup \
+ dbaccess/source/ui/uno/TableFilterDlg \
+ dbaccess/source/ui/uno/textconnectionsettings_uno \
+ dbaccess/source/ui/uno/unoadmin \
+ dbaccess/source/ui/uno/unoDirectSql \
+ dbaccess/source/ui/uno/unosqlmessage \
+ dbaccess/source/ui/uno/UserSettingsDlg \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,dbu,\
+ dbaccess/source/shared/dbustrings \
+ dbaccess/source/ui/control/ScrollHelper \
+ dbaccess/source/ui/dlg/optionalboolitem \
+ dbaccess/source/ui/querydesign/ConnectionLineData \
+ dbaccess/source/ui/querydesign/TableFieldInfo \
+))
+
+ifeq ($(GUI),WNT)
+ifneq (,$(strip $(WINDOWS_VISTA_PSDK)))
+ifeq (,$(strip $(PROF_EDITION)))
+dbu_DISABLE_ADO := $(true)
+endif
+endif
+ifneq ($(dbu_DISABLE_ADO),$(true))
+$(eval $(call gb_Library_add_noexception_objects,dbu,\
+ dbaccess/source/ui/dlg/adodatalinks \
+))
+endif
+endif
+
+# workaround for issue http://qa.openoffice.org/issues/show_bug.cgi?id=102305 Linux specific
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_cxxobjects,dbu,\
+ dbaccess/source/ui/uno/copytablewizard \
+ , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,dbu,\
+ dbaccess/source/ui/uno/copytablewizard \
+))
+endif
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
new file mode 100644
index 0000000..5ade815
--- /dev/null
+++ b/dbaccess/Library_sdbt.mk
@@ -0,0 +1,67 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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,sdbt))
+
+$(eval $(call gb_Library_add_package_headers,sdbt,\
+ dbaccess_inc \
+))
+
+$(eval $(call gb_Library_add_precompiled_header,sdbt,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess))
+
+$(eval $(call gb_Library_set_include,sdbt,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sdbt,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ dbtools \
+ sal \
+ tl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt))
+
+$(eval $(call gb_Library_add_exception_objects,sdbt,\
+ dbaccess/source/sdbtools/connection/connectiontools \
+ dbaccess/source/sdbtools/connection/datasourcemetadata \
+ dbaccess/source/sdbtools/connection/objectnames \
+ dbaccess/source/sdbtools/connection/tablename \
+ dbaccess/source/sdbtools/misc/module_sdbt \
+ dbaccess/source/sdbtools/misc/sdbt_services \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,sdbt,\
+ dbaccess/source/shared/sdbtstrings \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index df8996c..741f1af 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -27,8 +27,25 @@
$(eval $(call gb_Module_Module,dbaccess))
+$(eval $(call gb_Module_add_targets,dbaccess,\
+ AllLangResTarget_adabasui \
+ AllLangResTarget_dba \
+ AllLangResTarget_dbmm \
+ AllLangResTarget_dbu \
+ $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \
+ Library_adabasui \
+ Library_dba \
+ Library_dbaxml \
+ Library_dbmm \
+ Library_dbu \
+ Package_inc \
+ Package_uiconfig \
+))
+
$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
JunitTest_dbaccess_unoapi \
))
+$(call $(gb_Library_get_target,dbu)) :| $(call $(gb_SrsTemplateTarget_get_target,dbaccess/dbu))
+
# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Package_inc.mk b/dbaccess/Package_inc.mk
new file mode 100644
index 0000000..b949a31
--- /dev/null
+++ b/dbaccess/Package_inc.mk
@@ -0,0 +1,41 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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_Package_Package,dbaccess_inc,$(SRCDIR)/dbaccess/inc))
+
+$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/AsyncronousLink.hxx,AsyncronousLink.hxx))
+$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/controllerframe.hxx,controllerframe.hxx))
+$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/dataview.hxx,dataview.hxx))
+$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/dbaccessdllapi.h,dbaccessdllapi.h))
+$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/dbaundomanager.hxx,dbaundomanager.hxx))
+$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/dbsubcomponentcontroller.hxx,dbsubcomponentcontroller.hxx))
+$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/genericcontroller.hxx,genericcontroller.hxx))
+$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/IController.hxx,IController.hxx))
+$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/IReference.hxx,IReference.hxx))
+$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/ToolBoxHelper.hxx,ToolBoxHelper.hxx))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Package_uiconfig.mk b/dbaccess/Package_uiconfig.mk
new file mode 100644
index 0000000..17a4b52
--- /dev/null
+++ b/dbaccess/Package_uiconfig.mk
@@ -0,0 +1,50 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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_Package_Package,dbaccess_uiconfig,$(SRCDIR)/dbaccess/uiconfig))
+
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/menubar/menubar.xml,dbapp/menubar/menubar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/statusbar/statusbar.xml,dbapp/statusbar/statusbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/formobjectbar.xml,dbapp/toolbar/formobjectbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/queryobjectbar.xml,dbapp/toolbar/queryobjectbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/reportobjectbar.xml,dbapp/toolbar/reportobjectbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/tableobjectbar.xml,dbapp/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/toolbar.xml,dbapp/toolbar/toolbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbbrowser/menubar/compat.xml,dbbrowser/menubar/compat.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbbrowser/toolbar/toolbar.xml,dbbrowser/toolbar/toolbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/menubar/menubar.xml,dbquery/menubar/menubar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/designobjectbar.xml,dbquery/toolbar/designobjectbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/sqlobjectbar.xml,dbquery/toolbar/sqlobjectbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/toolbar.xml,dbquery/toolbar/toolbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbrelation/menubar/menubar.xml,dbrelation/menubar/menubar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbrelation/toolbar/toolbar.xml,dbrelation/toolbar/toolbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtable/menubar/menubar.xml,dbtable/menubar/menubar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtable/toolbar/toolbar.xml,dbtable/toolbar/toolbar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtdata/menubar/menubar.xml,dbtdata/menubar/menubar.xml))
+$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtdata/toolbar/toolbar.xml,dbtdata/toolbar/toolbar.xml))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/inc/makefile.mk b/dbaccess/inc/makefile.mk
deleted file mode 100644
index 5aa9bfe..0000000
--- a/dbaccess/inc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=..
-
-PRJNAME=dbaccess
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/dbaccess/prj/makefile.mk b/dbaccess/prj/makefile.mk
new file mode 100755
index 0000000..e312a7c
--- /dev/null
+++ b/dbaccess/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/dbaccess/source/core/api/makefile.mk b/dbaccess/source/core/api/makefile.mk
deleted file mode 100644
index 8ceda2f..0000000
--- a/dbaccess/source/core/api/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=api
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/dba.pmk
-
-# --- Files -------------------------------------
-SLOFILES= \
- $(SLO)$/querydescriptor.obj \
- $(SLO)$/FilteredContainer.obj \
- $(SLO)$/TableDeco.obj \
- $(SLO)$/RowSetCacheIterator.obj \
- $(SLO)$/RowSet.obj \
- $(SLO)$/column.obj \
- $(SLO)$/RowSetBase.obj \
- $(SLO)$/CRowSetDataColumn.obj \
- $(SLO)$/CRowSetColumn.obj \
- $(SLO)$/querycomposer.obj \
- $(SLO)$/CIndexes.obj \
- $(SLO)$/BookmarkSet.obj \
- $(SLO)$/KeySet.obj \
- $(SLO)$/StaticSet.obj \
- $(SLO)$/CacheSet.obj \
- $(SLO)$/RowSetCache.obj \
- $(SLO)$/definitioncolumn.obj \
- $(SLO)$/resultcolumn.obj \
- $(SLO)$/datacolumn.obj \
- $(SLO)$/resultset.obj \
- $(SLO)$/statement.obj \
- $(SLO)$/preparedstatement.obj \
- $(SLO)$/callablestatement.obj \
- $(SLO)$/query.obj \
- $(SLO)$/querycontainer.obj \
- $(SLO)$/table.obj \
- $(SLO)$/viewcontainer.obj \
- $(SLO)$/tablecontainer.obj \
- $(SLO)$/SingleSelectQueryComposer.obj \
- $(SLO)$/HelperCollections.obj \
- $(SLO)$/datasettings.obj \
- $(SLO)$/View.obj \
- $(SLO)$/WrappedResultSet.obj \
- $(SLO)$/OptimisticSet.obj \
- $(SLO)$/PrivateRow.obj \
- $(SLO)$/columnsettings.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/dbaccess/source/core/dataaccess/makefile.mk b/dbaccess/source/core/dataaccess/makefile.mk
deleted file mode 100644
index e37544b..0000000
--- a/dbaccess/source/core/dataaccess/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=dataaccess
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/dba.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES= \
- $(SLO)$/SharedConnection.obj \
- $(SLO)$/ContentHelper.obj \
- $(SLO)$/bookmarkcontainer.obj \
- $(SLO)$/definitioncontainer.obj \
- $(SLO)$/commanddefinition.obj \
- $(SLO)$/documentcontainer.obj \
- $(SLO)$/commandcontainer.obj \
- $(SLO)$/documentdefinition.obj \
- $(SLO)$/ComponentDefinition.obj \
- $(SLO)$/databasecontext.obj \
- $(SLO)$/connection.obj \
- $(SLO)$/datasource.obj \
- $(SLO)$/databaseregistrations.obj \
- $(SLO)$/intercept.obj \
- $(SLO)$/myucp_datasupplier.obj \
- $(SLO)$/myucp_resultset.obj \
- $(SLO)$/databasedocument.obj \
- $(SLO)$/dataaccessdescriptor.obj\
- $(SLO)$/ModelImpl.obj \
- $(SLO)$/documentevents.obj \
- $(SLO)$/documenteventexecutor.obj \
- $(SLO)$/documenteventnotifier.obj \
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/dbaccess/source/core/misc/makefile.mk b/dbaccess/source/core/misc/makefile.mk
deleted file mode 100644
index 3f41bbf..0000000
--- a/dbaccess/source/core/misc/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=misc
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/dba.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES= \
- $(SLO)$/sdbcoretools.obj \
- $(SLO)$/services.obj \
- $(SLO)$/PropertyForward.obj \
- $(SLO)$/ContainerMediator.obj \
- $(SLO)$/userinformation.obj \
- $(SLO)$/ContainerListener.obj \
- $(SLO)$/objectnameapproval.obj \
- $(SLO)$/DatabaseDataProvider.obj \
- $(SLO)$/module_dba.obj \
- $(SLO)$/dsntypes.obj \
- $(SLO)$/veto.obj \
- $(SLO)$/apitools.obj \
- $(SLO)$/dbastrings.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/dbaccess/source/core/recovery/makefile.mk b/dbaccess/source/core/recovery/makefile.mk
deleted file mode 100644
index e92af23..0000000
--- a/dbaccess/source/core/recovery/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# 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
-#
-# 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 \
- $(SLO)$/subcomponentloader.obj \
- $(SLO)$/storagestream.obj \
- $(SLO)$/storagexmlstream.obj \
- $(SLO)$/storagetextstream.obj \
- $(SLO)$/subcomponentrecovery.obj \
- $(SLO)$/settingsimport.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/dbaccess/source/core/resource/makefile.mk b/dbaccess/source/core/resource/makefile.mk
deleted file mode 100644
index 35a54c6..0000000
--- a/dbaccess/source/core/resource/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=core_resource
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/dba.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=core_strings
-SRC1FILES= \
- strings.src \
-
-EXCEPTIONSFILES= \
- $(SLO)$/core_resource.obj
-
-SLOFILES= $(EXCEPTIONSFILES)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/dbaccess/source/ext/adabas/makefile.mk b/dbaccess/source/ext/adabas/makefile.mk
deleted file mode 100644
index 8dbbe7a..0000000
--- a/dbaccess/source/ext/adabas/makefile.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=..$/..$/..
-
-PRJNAME=dbaccess
-TARGET=adabasui
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-
-# --- resource -----------------------------------------------------
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- AdabasNewDb.src
-
-# --- defines ------------------------------------------------------
-CDEFS+=-DCOMPMOD_NAMESPACE=adabasui
-
-# --- Files -------------------------------------
-SLOFILES=\
- $(SLO)$/ASqlNameEdit.obj \
- $(SLO)$/AdabasNewDb.obj \
- $(SLO)$/ANewDb.obj \
- $(SLO)$/adabasuistrings.obj \
- $(SLO)$/Aservices.obj \
- $(SLO)$/Acomponentmodule.obj
-
-# --- Library -----------------------------------
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(DBTOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(SVTOOLLIB) \
- $(TOOLSLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(UCBHELPERLIB) \
- $(SFXLIB) \
- $(TKLIB) \
- $(COMPHELPERLIB)
-
-SHL1IMPLIB=i$(SHL1TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=$(TARGET).dxp
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- .res file ----------------------------------------------------------
-RES1FILELIST=\
- $(SRS)$/$(SRS1NAME).srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/adabasui.component
-
-$(MISC)/adabasui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- adabasui.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt adabasui.component
diff --git a/dbaccess/source/ext/macromigration/makefile.mk b/dbaccess/source/ext/macromigration/makefile.mk
deleted file mode 100644
index b71330f..0000000
--- a/dbaccess/source/ext/macromigration/makefile.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=dbmm
-USE_DEFFILE=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-# ... resource files ............................
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- macromigration.src
-
-# ... object files ............................
-SLOFILES= $(SLO)$/macromigrationwizard.obj \
- $(SLO)$/macromigrationdialog.obj \
- $(SLO)$/macromigrationpages.obj \
- $(SLO)$/dbmm_module.obj \
- $(SLO)$/dbmm_services.obj \
- $(SLO)$/migrationengine.obj \
- $(SLO)$/docinteraction.obj \
- $(SLO)$/progresscapture.obj \
- $(SLO)$/progressmixer.obj \
- $(SLO)$/migrationlog.obj \
- $(SLO)$/dbmm_types.obj \
-
-# --- library -----------------------------------
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(SALLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(SVXCORELIB) \
- $(SVXLIB) \
- $(UCBHELPERLIB) \
- $(XMLSCRIPTLIB)
-
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1IMPLIB= i$(TARGET)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
-# --- .res files -------------------------------
-
-RES1FILELIST=\
- $(SRS)$/$(TARGET).srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/dbmm.component
-
-$(MISC)/dbmm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- dbmm.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt dbmm.component
diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk
deleted file mode 100644
index 33ff074..0000000
--- a/dbaccess/source/filter/xml/makefile.mk
+++ /dev/null
@@ -1,121 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=dbaxml
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-SLOFILES= $(SLO)$/xmlfilter.obj \
- $(SLO)$/dbloader2.obj \
- $(SLO)$/xmlDatabase.obj \
- $(SLO)$/xmlDataSource.obj \
- $(SLO)$/xmlTableFilterPattern.obj \
- $(SLO)$/xmlTableFilterList.obj \
- $(SLO)$/xmlDataSourceInfo.obj \
- $(SLO)$/xmlDataSourceSetting.obj \
- $(SLO)$/xmlDataSourceSettings.obj \
- $(SLO)$/xmlDocuments.obj \
- $(SLO)$/xmlComponent.obj \
- $(SLO)$/xmlHierarchyCollection.obj \
- $(SLO)$/xmlLogin.obj \
- $(SLO)$/xmlExport.obj \
- $(SLO)$/xmlQuery.obj \
- $(SLO)$/xmlTable.obj \
- $(SLO)$/xmlColumn.obj \
- $(SLO)$/xmlStyleImport.obj \
- $(SLO)$/xmlHelper.obj \
- $(SLO)$/xmlAutoStyle.obj \
- $(SLO)$/xmlConnectionData.obj \
- $(SLO)$/xmlDatabaseDescription.obj \
- $(SLO)$/xmlFileBasedDatabase.obj \
- $(SLO)$/xmlServerDatabase.obj \
- $(SLO)$/xmlConnectionResource.obj \
- $(SLO)$/xmlservices.obj
-
-# --- Library -----------------------------------
-LIB1TARGET=$(SLB)$/dba_flt.lib
-LIB1FILES=\
- $(SLB)$/fltshared.lib \
- $(SLB)$/$(TARGET).lib
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS=\
- $(XMLOFFLIB) \
- $(VCLLIB) \
- $(TOOLSLIB) \
- $(TKLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SFXLIB) \
- $(SVLLIB) \
- $(DBTOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(SO2LIB) \
- $(SALLIB)
-
-.IF "$(GUI)"=="OS2"
-SHL1STDLIBS+= \
- idba.lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
-SHL1STDLIBS+= \
- -ldba$(DLLPOSTFIX)
-.ELSE
-SHL1STDLIBS+= \
- idba.lib
-.ENDIF
-
-
-SHL1DEPN=
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB= i$(SHL1TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/dbaxml.component
-
-$(MISC)/dbaxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- dbaxml.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt dbaxml.component
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 76ddf13..a3410c4 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -69,7 +69,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml()
//---------------------------------------------------------------------------------------
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char **ppEnvTypeName,
uno_Environment **
)
@@ -79,7 +79,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/dbaccess/source/sdbtools/connection/makefile.mk b/dbaccess/source/sdbtools/connection/makefile.mk
deleted file mode 100644
index f8d43df..0000000
--- a/dbaccess/source/sdbtools/connection/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=conntools
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-SLOFILES= \
- $(SLO)$/connectiontools.obj \
- $(SLO)$/tablename.obj \
- $(SLO)$/objectnames.obj \
- $(SLO)$/datasourcemetadata.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/dbaccess/source/sdbtools/misc/makefile.mk b/dbaccess/source/sdbtools/misc/makefile.mk
deleted file mode 100644
index 8c51fc7..0000000
--- a/dbaccess/source/sdbtools/misc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=sdbtmisc
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-SLOFILES= \
- $(SLO)$/sdbt_services.obj \
- $(SLO)$/module_sdbt.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 9767bd1..af6c160 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -55,7 +55,7 @@ extern "C" void SAL_CALL sdbt_initializeModule()
//---------------------------------------------------------------------------------------
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char **ppEnvTypeName,
uno_Environment **
)
@@ -65,7 +65,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
diff --git a/dbaccess/source/sdbtools/resource/makefile.mk b/dbaccess/source/sdbtools/resource/makefile.mk
deleted file mode 100644
index 9b55104..0000000
--- a/dbaccess/source/sdbtools/resource/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=sdbt_resource
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=sdbt_strings
-SRC1FILES= \
- sdbt_strings.src \
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/dbaccess/source/shared/makefile.mk b/dbaccess/source/shared/makefile.mk
deleted file mode 100644
index 7906623..0000000
--- a/dbaccess/source/shared/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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
-LIBTARGET=NO
-TARGET=shared
-LIB1TARGET=$(SLB)$/dbushared.lib
-LIB2TARGET=$(SLB)$/fltshared.lib
-LIB4TARGET=$(SLB)$/sdbtshared.lib
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Types -------------------------------------
-
-# --- Files -------------------------------------
-EXCEPTIONSFILES= \
- $(SLO)$/dbu_reghelper.obj \
- $(SLO)$/flt_reghelper.obj
-
-SLOFILES= \
- $(EXCEPTIONSFILES) \
- $(SLO)$/xmlstrings.obj \
- $(SLO)$/dbustrings.obj
-
-LIB1OBJFILES= \
- $(SLO)$/dbu_reghelper.obj \
- $(SLO)$/dbustrings.obj
-
-LIB2OBJFILES= \
- $(SLO)$/flt_reghelper.obj \
- $(SLO)$/xmlstrings.obj
-
-LIB4OBJFILES= \
- $(SLO)$/sdbtstrings.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/dbaccess/source/ui/app/makefile.mk b/dbaccess/source/ui/app/makefile.mk
deleted file mode 100644
index 658456f..0000000
--- a/dbaccess/source/ui/app/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=app
-
-# BMP_IN=$(PRJ)$/res
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-# IMGLST_SRS=$(SRS)$/$(TARGET).srs
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
- $(SLO)$/AppController.obj \
- $(SLO)$/AppControllerDnD.obj \
- $(SLO)$/AppControllerGen.obj \
- $(SLO)$/AppDetailPageHelper.obj \
- $(SLO)$/AppDetailView.obj \
- $(SLO)$/AppIconControl.obj \
- $(SLO)$/AppSwapWindow.obj \
- $(SLO)$/AppTitleWindow.obj \
- $(SLO)$/AppView.obj \
- $(SLO)$/subcomponentmanager.obj
-
-
-SLOFILES =\
- $(EXCEPTIONSFILES)
-
-SRS1NAME=$(TARGET)
-SRC1FILES = app.src
-
-
-# --- Targets -------------------------------------------------------
-
-
-.INCLUDE : target.mk
-
-$(SRS)$/$(TARGET).srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
-
-
diff --git a/dbaccess/source/ui/browser/makefile.mk b/dbaccess/source/ui/browser/makefile.mk
deleted file mode 100644
index 4d0cbc8..0000000
--- a/dbaccess/source/ui/browser/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=browser
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
- $(SLO)$/AsyncronousLink.obj \
- $(SLO)$/brwctrlr.obj \
- $(SLO)$/brwview.obj \
- $(SLO)$/dataview.obj \
- $(SLO)$/dbexchange.obj \
- $(SLO)$/dbloader.obj \
- $(SLO)$/dbtreemodel.obj \
- $(SLO)$/dbtreeview.obj \
- $(SLO)$/dsEntriesNoExp.obj \
- $(SLO)$/dsbrowserDnD.obj \
- $(SLO)$/exsrcbrw.obj \
- $(SLO)$/formadapter.obj \
- $(SLO)$/genericcontroller.obj \
- $(SLO)$/sbagrid.obj \
- $(SLO)$/sbamultiplex.obj \
- $(SLO)$/unodatbr.obj
-
-SLOFILES =\
- $(EXCEPTIONSFILES)
-
-SRS1NAME=$(TARGET)
-SRC1FILES = sbabrw.src \
- sbagrid.src
-
-# --- Targets -------------------------------------------------------
-
-
-.INCLUDE : target.mk
-
-$(SRS)$/$(TARGET).srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
-
-
diff --git a/dbaccess/source/ui/control/makefile.mk b/dbaccess/source/ui/control/makefile.mk
deleted file mode 100644
index 913a475..0000000
--- a/dbaccess/source/ui/control/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=uicontrols
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-# ... resource files ............................
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- TableGrantCtrl.src \
- undosqledit.src \
- tabletree.src
-
-# ... exception files .........................
-
-EXCEPTIONSFILES=\
- $(SLO)$/ColumnControlWindow.obj \
- $(SLO)$/FieldDescControl.obj \
- $(SLO)$/RelationControl.obj \
- $(SLO)$/SqlNameEdit.obj \
- $(SLO)$/TableGrantCtrl.obj \
- $(SLO)$/VertSplitView.obj \
- $(SLO)$/charsetlistbox.obj \
- $(SLO)$/curledit.obj \
- $(SLO)$/dbtreelistbox.obj \
- $(SLO)$/listviewitems.obj \
- $(SLO)$/marktree.obj \
- $(SLO)$/opendoccontrols.obj \
- $(SLO)$/sqledit.obj \
- $(SLO)$/statusbarontroller.obj \
- $(SLO)$/tabletree.obj \
- $(SLO)$/toolboxcontroller.obj \
- $(SLO)$/undosqledit.obj
-
-# ... object files ............................
-
-SLOFILES= \
- $(EXCEPTIONSFILES) \
- $(SLO)$/ScrollHelper.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk
deleted file mode 100644
index 8fa615d..0000000
--- a/dbaccess/source/ui/dlg/makefile.mk
+++ /dev/null
@@ -1,154 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list