diff options
| -rw-r--r-- | Repository.mk | 26 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 10 | ||||
| -rw-r--r-- | connectivity/Library_kab1.mk | 56 | ||||
| -rw-r--r-- | connectivity/Library_kabdrv1.mk | 68 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 9 | ||||
| -rw-r--r-- | vcl/Library_vclplug_kde.mk | 6 |
6 files changed, 158 insertions, 17 deletions
diff --git a/Repository.mk b/Repository.mk index aef04da5435a..ce3931f0b4c5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -278,18 +278,20 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ hwp \ hyphen \ i18nregexp \ - icd \ - icg \ - idx \ - ime \ - ipb \ - ipd \ - ips \ - ipt \ - ipx \ - ira \ - itg \ - iti \ + icd \ + icg \ + idx \ + ime \ + ipb \ + ipd \ + ips \ + ipt \ + ipx \ + ira \ + itg \ + iti \ + kab1 \ + kabdrv1 \ lng \ lnth \ log \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index af1ee0016c2e..c3ebc6d84286 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1064,6 +1064,16 @@ endef endif # SYSTEM_CURL +define gb_LinkTarget__use_kde +$(call gb_LinkTarget_add_libs,$(1),\ + $(KDE_LIBS) \ +) + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(KDE_CFLAGS) \ +) +endef ifeq ($(SYSTEM_MOZILLA_HEADERS),YES) diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk new file mode 100644 index 000000000000..c4f503c31ad0 --- /dev/null +++ b/connectivity/Library_kab1.mk @@ -0,0 +1,56 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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. +# +# Major Contributor(s): +# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer) +# +# All Rights Reserved. +# +# 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,kab1)) + +$(eval $(call gb_Library_add_package_headers,kab1,connectivity_inc)) + +$(eval $(call gb_Library_use_externals,kab1,kde)) + +$(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1)) + +$(eval $(call gb_Library_add_api,kab1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,kab1,\ + comphelper \ + cppu \ + cppuhelper \ + dbtools \ + sal \ + salhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,kab1,\ + connectivity/source/drivers/kab/KDriver \ + connectivity/source/drivers/kab/KServices \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk new file mode 100644 index 000000000000..2885ef98569a --- /dev/null +++ b/connectivity/Library_kabdrv1.mk @@ -0,0 +1,68 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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. +# +# Major Contributor(s): +# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer) +# +# All Rights Reserved. +# +# 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,kabdrv1)) + +$(eval $(call gb_Library_add_package_headers,kabdrv1,connectivity_inc)) + +$(eval $(call gb_Library_add_api,kabdrv1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_libs,kabdrv1,\ + -lkabc \ +)) + +$(eval $(call gb_Library_add_linked_libs,kabdrv1,\ + cppu \ + cppuhelper \ + sal \ + salhelper \ + dbtools \ + comphelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,kabdrv1,\ + connectivity/source/drivers/kab/KColumns \ + connectivity/source/drivers/kab/KTable \ + connectivity/source/drivers/kab/KTables \ + connectivity/source/drivers/kab/KCatalog \ + connectivity/source/drivers/kab/KResultSet \ + connectivity/source/drivers/kab/KStatement \ + connectivity/source/drivers/kab/KPreparedStatement \ + connectivity/source/drivers/kab/KDatabaseMetaData \ + connectivity/source/drivers/kab/KConnection \ + connectivity/source/drivers/kab/KResultSetMetaData \ + connectivity/source/drivers/kab/kcondition \ + connectivity/source/drivers/kab/korder \ + connectivity/source/drivers/kab/kfields \ + connectivity/source/drivers/kab/KDEInit \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index d268be1b5703..8c87804c7e41 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -43,6 +43,15 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif +ifeq ($(GUI),UNX) +ifeq ($(ENABLE_KAB),TRUE) +$(eval $(call gb_Module_add_targets,connectivity,\ + Library_kab1 \ + Library_kabdrv1 \ +)) +endif +endif + ifeq ($(GUI),WNT) $(eval $(call gb_Module_add_targets,connectivity,\ Library_ado \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index dbfeb9148613..bf8fe78dd400 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -33,11 +33,6 @@ $(eval $(call gb_Library_set_include,vclplug_kde,\ -I$(SRCDIR)/vcl/inc \ )) -$(eval $(call gb_Library_set_include,vclplug_kde,\ - $$(INCLUDE) \ - $$(KDE_CFLAGS) \ -)) - $(eval $(call gb_Library_add_defs,vclplug_kde,\ -DVCLPLUG_KDE_IMPLEMENTATION \ )) @@ -76,6 +71,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ $(eval $(call gb_Library_use_externals,vclplug_kde,\ icule \ icuuc \ + kde \ )) $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ |