[Libreoffice-commits] .: Branch 'feature/tubes2' - sc/Library_sc.mk tubes/Module_tubes.mk tubes/Package_inc.mk

[Eike Rathke]

 sc/Library_sc.mk      |   23 +++++++++++++++++++++++
 tubes/Module_tubes.mk |    1 +
 tubes/Package_inc.mk  |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+)

New commits:
commit 276c2a616000acc8890740ab9503da3b73e872e6
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Mar 22 21:31:31 2012 +0100

    tubes: pull in tubes headers and linkage

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index a3554ce..42fd0fd 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -45,6 +45,28 @@ $(eval $(call gb_Library_add_api,sc,\
     udkapi \
 ))
 
+
+ifeq ($(ENABLE_TELEPATHY),TRUE)
+
+$(eval $(call gb_Library_add_linked_libs,sc,\
+	tubes \
+))
+
+$(eval $(call gb_Library_add_cxxflags,sc,\
+	$$(TELEPATHY_CFLAGS) \
+))
+
+$(eval $(call gb_Library_add_libs,sc,\
+	$$(TELEPATHY_LIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,sc,\
+	telepathy \
+))
+
+endif
+
+
 $(eval $(call gb_Library_add_linked_libs,sc,\
 	avmedia \
 	basegfx \
@@ -313,6 +335,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 	sc/source/ui/cctrl/popmenu \
 	sc/source/ui/cctrl/tbinsert \
 	sc/source/ui/cctrl/tbzoomsliderctrl \
+	sc/source/ui/collab/collab \
 	sc/source/ui/collab/sendfunc \
 	sc/source/ui/dbgui/asciiopt \
 	sc/source/ui/dbgui/consdlg \
diff --git a/tubes/Module_tubes.mk b/tubes/Module_tubes.mk
index fb1c9d7..5746ce5 100644
--- a/tubes/Module_tubes.mk
+++ b/tubes/Module_tubes.mk
@@ -31,6 +31,7 @@ ifeq ($(ENABLE_TELEPATHY),TRUE)
 
 $(eval $(call gb_Module_add_targets,tubes,\
 	Library_tubes \
+	Package_inc \
 	Executable_liboapprover \
 ))
 
diff --git a/tubes/Package_inc.mk b/tubes/Package_inc.mk
new file mode 100644
index 0000000..3ac8876
--- /dev/null
+++ b/tubes/Package_inc.mk
@@ -0,0 +1,39 @@
+# -*- 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) 2012 Red Hat, Inc., Eike Rathke <erack at redhat.com>
+#
+# 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_Package_Package,tubes_inc,$(SRCDIR)/tubes/inc))
+
+$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/conference.hxx,tubes/conference.hxx))
+$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/constants.h,tubes/constants.h))
+$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/contact-list.hxx,tubes/contact-list.hxx))
+$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/file-transfer-helper.h,tubes/file-transfer-helper.h))
+$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/manager.hxx,tubes/manager.hxx))
+$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/packet.hxx,tubes/packet.hxx))
+$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/tubesdllapi.h,tubes/tubesdllapi.h))
+
+#$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/,tubes/))
+
+# vim: set noet sw=4 ts=4: