[Libreoffice-commits] .: Repository.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_svp.mk vcl/Module_vcl.mk vcl/StaticLibrary_headless.mk

[Stephan Bergmann]

 Repository.mk                 |    1 
 vcl/Library_vclplug_gtk3.mk   |   11 +++-----
 vcl/Library_vclplug_svp.mk    |   11 +++-----
 vcl/Module_vcl.mk             |    2 +
 vcl/StaticLibrary_headless.mk |   54 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 65 insertions(+), 14 deletions(-)

New commits:
commit f33b3791edf7ae8eba979c16d3338ef7c0b4a768
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 13 18:36:02 2012 +0100

    Related fdo#47246: Extract objects used in both svp and gtk3 plugins

diff --git a/Repository.mk b/Repository.mk
index 1b66b02..ee6835c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -520,6 +520,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     basegfx_s \
     dtobj \
+    headless \
     libeay32 \
     npsoenv \
     nputils \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index d35787a..0cc3c23 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -111,13 +111,10 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
     vcl/unx/gtk3/gdi/gtk3salprn-gtk \
     vcl/unx/gtk3/window/gtk3gtkframe \
     vcl/unx/gtk3/window/gtk3gtkobject \
-    vcl/headless/svpbmp \
-    vcl/headless/svpdummies \
-    vcl/headless/svpelement \
-    vcl/headless/svpframe \
-    vcl/headless/svpprn \
-    vcl/headless/svptext \
-    vcl/headless/svpvd \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,vclplug_gtk3,\
+    headless \
 ))
 
 ifeq ($(OS),LINUX)
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 8bb14d6..e0c5a00 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -71,16 +71,13 @@ $(eval $(call gb_Library_use_externals,vclplug_svp,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
-    vcl/headless/svpbmp \
-    vcl/headless/svpdummies \
-    vcl/headless/svpelement \
-    vcl/headless/svpframe \
     vcl/headless/svpgdi \
     vcl/headless/svpinst \
     vcl/headless/svpdata \
-    vcl/headless/svpprn \
-    vcl/headless/svptext \
-    vcl/headless/svpvd \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,vclplug_svp,\
+    headless \
 ))
 
 ifeq ($(OS),LINUX)
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 7ec9395..dfd0e34 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
     Library_vclplug_svp \
     Library_vclplug_gen \
     Library_desktop_detector \
+    StaticLibrary_headless \
 ))
 
 ifneq ($(ENABLE_GTK),)
@@ -70,6 +71,7 @@ endif
 ifeq ($(GUIBASE),headless)
 $(eval $(call gb_Module_add_targets,vcl,\
     Library_vclplug_svp \
+    StaticLibrary_headless \
 ))
 endif
 
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
new file mode 100644
index 0000000..bea6fed
--- /dev/null
+++ b/vcl/StaticLibrary_headless.mk
@@ -0,0 +1,54 @@
+##
+## 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., Stephan Bergmann <sbergman at redhat.com>
+##   (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_StaticLibrary_StaticLibrary,headless))
+
+$(eval $(call gb_StaticLibrary_add_api,headless,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_cxxflags,headless,\
+    $$(FREETYPE_CFLAGS) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,headless,\
+    vcl/headless/svpbmp \
+    vcl/headless/svpdummies \
+    vcl/headless/svpelement \
+    vcl/headless/svpframe \
+    vcl/headless/svpprn \
+    vcl/headless/svptext \
+    vcl/headless/svpvd \
+))
+
+$(eval $(call gb_StaticLibrary_set_include,headless,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+    -I$(SRCDIR)/solenv/inc \
+))