[Libreoffice-commits] .: Repository.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk desktop/Module_desktop.mk desktop/StaticLibrary_winlauncher.mk
Michael Stahl
mst at kemper.freedesktop.org
Wed Mar 14 04:34:59 PDT 2012
Repository.mk | 4 +++
desktop/Executable_sbase.mk | 9 +++-----
desktop/Executable_scalc.mk | 9 +++-----
desktop/Executable_sdraw.mk | 9 +++-----
desktop/Executable_simpress.mk | 9 +++-----
desktop/Executable_smath.mk | 9 +++-----
desktop/Executable_sweb.mk | 9 +++-----
desktop/Executable_swriter.mk | 9 +++-----
desktop/Module_desktop.mk | 1
desktop/StaticLibrary_winlauncher.mk | 38 +++++++++++++++++++++++++++++++++++
10 files changed, 71 insertions(+), 35 deletions(-)
New commits:
commit 5cc6398985181574b68ab15386176fb806386490
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Mar 14 12:30:53 2012 +0100
fdo#47246: desktop: factor out a winlauncher static library
diff --git a/Repository.mk b/Repository.mk
index ee6835c..351a365 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -83,6 +83,10 @@ $(eval $(call gb_Helper_register_executables,OOO,\
unopkgio \
))
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ winlauncher \
+))
+
else
$(eval $(call gb_Helper_register_executables,OOO,\
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 37738a0..f3caf5b 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,sbase))
$(eval $(call gb_Executable_set_targettype_gui,sbase,YES))
-$(eval $(call gb_Executable_set_include,sbase,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_add_defs,sbase,\
-DUNICODE \
))
@@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,sbase,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Executable_add_linked_static_libs,sbase,\
+ winlauncher \
+))
+
$(eval $(call gb_Executable_add_noexception_objects,sbase,\
- desktop/win32/source/applauncher/launcher \
desktop/win32/source/applauncher/sbase \
))
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index ec72742..3c9990b 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,scalc))
$(eval $(call gb_Executable_set_targettype_gui,scalc,YES))
-$(eval $(call gb_Executable_set_include,scalc,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_add_defs,scalc,\
-DUNICODE \
))
@@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,scalc,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Executable_add_linked_static_libs,scalc,\
+ winlauncher \
+))
+
$(eval $(call gb_Executable_add_noexception_objects,scalc,\
- desktop/win32/source/applauncher/launcher \
desktop/win32/source/applauncher/scalc \
))
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 24fec0e..dcea97d 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,sdraw))
$(eval $(call gb_Executable_set_targettype_gui,sdraw,YES))
-$(eval $(call gb_Executable_set_include,sdraw,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_add_defs,sdraw,\
-DUNICODE \
))
@@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,sdraw,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Executable_add_linked_static_libs,sdraw,\
+ winlauncher \
+))
+
$(eval $(call gb_Executable_add_noexception_objects,sdraw,\
- desktop/win32/source/applauncher/launcher \
desktop/win32/source/applauncher/sdraw \
))
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index f0b7241..ab0cbc0 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,simpress))
$(eval $(call gb_Executable_set_targettype_gui,simpress,YES))
-$(eval $(call gb_Executable_set_include,simpress,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_add_defs,simpress,\
-DUNICODE \
))
@@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,simpress,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Executable_add_linked_static_libs,simpress,\
+ winlauncher \
+))
+
$(eval $(call gb_Executable_add_noexception_objects,simpress,\
- desktop/win32/source/applauncher/launcher \
desktop/win32/source/applauncher/simpress \
))
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index ff73c2a..fe1607b 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,smath))
$(eval $(call gb_Executable_set_targettype_gui,smath,YES))
-$(eval $(call gb_Executable_set_include,smath,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_add_defs,smath,\
-DUNICODE \
))
@@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,smath,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Executable_add_linked_static_libs,smath,\
+ winlauncher \
+))
+
$(eval $(call gb_Executable_add_noexception_objects,smath,\
- desktop/win32/source/applauncher/launcher \
desktop/win32/source/applauncher/smath \
))
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 00d0852..a8810b1 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,sweb))
$(eval $(call gb_Executable_set_targettype_gui,sweb,YES))
-$(eval $(call gb_Executable_set_include,sweb,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_add_defs,sweb,\
-DUNICODE \
))
@@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,sweb,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Executable_add_linked_static_libs,sweb,\
+ winlauncher \
+))
+
$(eval $(call gb_Executable_add_noexception_objects,sweb,\
- desktop/win32/source/applauncher/launcher \
desktop/win32/source/applauncher/sweb \
))
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index 7f5e8d9..74cd0d6 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,swriter))
$(eval $(call gb_Executable_set_targettype_gui,swriter,YES))
-$(eval $(call gb_Executable_set_include,swriter,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Executable_add_defs,swriter,\
-DUNICODE \
))
@@ -41,8 +37,11 @@ $(eval $(call gb_Executable_add_linked_libs,swriter,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Executable_add_linked_static_libs,swriter,\
+ winlauncher \
+))
+
$(eval $(call gb_Executable_add_noexception_objects,swriter,\
- desktop/win32/source/applauncher/launcher \
desktop/win32/source/applauncher/swriter \
))
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index d08ca59..7229fb8 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -79,6 +79,7 @@ endif
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,desktop,\
+ StaticLibrary_winlauncher \
Executable_crashrep.com \
Executable_quickstart \
Executable_sbase \
diff --git a/desktop/StaticLibrary_winlauncher.mk b/desktop/StaticLibrary_winlauncher.mk
new file mode 100644
index 0000000..606d628
--- /dev/null
+++ b/desktop/StaticLibrary_winlauncher.mk
@@ -0,0 +1,38 @@
+# -*- 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 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., Michael Stahl <mstahl 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,winlauncher))
+
+$(eval $(call gb_StaticLibrary_add_defs,winlauncher,\
+ -DUNICODE \
+))
+
+$(eval $(call gb_StaticLibrary_add_noexception_objects,winlauncher,\
+ desktop/win32/source/applauncher/launcher \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
More information about the Libreoffice-commits
mailing list