[Libreoffice-commits] .: Library_merged.mk

Michael Meeks michael at kemper.freedesktop.org
Wed Aug 24 06:47:27 PDT 2011


 Library_merged.mk |   96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

New commits:
commit 070ff659caa58d74de7997d34047c1e4b50304dd
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Aug 24 14:44:40 2011 +0100

    add missing file I omitted to add

diff --git a/Library_merged.mk b/Library_merged.mk
new file mode 100644
index 0000000..d23c82a
--- /dev/null
+++ b/Library_merged.mk
@@ -0,0 +1,96 @@
+# -*- Mode: makefile; 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. 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
+# Matúš Kukan <matus.kukan at gmail.com> (C) 2011, All Rights Reserved.
+#
+# 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,merged))
+
+$(eval $(call gb_Library_add_linked_libs,merged,$(filter-out $(gb_MERGED_LIBS),\
+	avmedia \
+	basegfx \
+	canvastools \
+	comphelper \
+	cppcanvas \
+	cppu \
+	cppuhelper \
+	drawinglayer \
+	editeng \
+	fwe \
+	i18nisolang1 \
+	i18npaper \
+	i18nutil \
+	jvmfwk \
+	lng \
+	fwe \
+	sal \
+	salhelper \
+	sax \
+	sb \
+	sfx \
+	sot \
+	svl \
+	svt \
+	svx \
+	svxcore \
+	tk \
+	tl \
+	ucbhelper \
+	utl \
+	vcl \
+	xo \
+	xcr \
+	$(gb_STDLIBS) \
+)))
+
+$(eval $(call gb_Library_use_externals,merged,\
+	icui18n \
+	icuuc \
+	jpeg \
+	libxml2 \
+	zlib \
+))
+
+$(eval $(call gb_Library_add_library_objects,merged,\
+	$(gb_MERGED_LIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,merged,\
+	advapi32 \
+	gdi32 \
+	ole32 \
+	oleaut32 \
+	shell32 \
+	user32 \
+	uuid \
+))
+endif
+
+# something is missing here for sure
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_linked_libs,merged,\
+	objc \
+	Cocoa \
+))
+endif
+
+# vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list