From bb3127a8c053434ab1f4c42624b3d70a5fbfa9e6 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 25 Jan 2011 17:35:20 +0100 Subject: vcl2gnumake: #i116588# move vcl to gbuild (step 1, linux) --- vcl/Module_vcl.mk | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 vcl/Module_vcl.mk (limited to 'vcl/Module_vcl.mk') diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk new file mode 100644 index 000000000000..5cb49b312507 --- /dev/null +++ b/vcl/Module_vcl.mk @@ -0,0 +1,63 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + + +$(eval $(call gb_Module_Module,vcl)) + +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vcl \ + Package_inc \ +)) +# FIXME: WiP +# StaticLibrary_vclmain \ + +ifeq ($(GUI),UNX) +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vclplug_gen \ + Library_vclplug_svp \ + Library_desktop_detector \ +)) + +ifneq ($(ENABLE_GTK),) +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vclplug_gtk \ +)) +endif +ifneq ($(ENABLE_KDE),) +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vclplug_kde \ +)) +endif +ifneq ($(ENABLE_KDE4),) +$(eval $(call gb_Module_add_targets,vcl,\ + Library_vclplug_kde4 \ +)) +endif +endif + + +# vim: set noet sw=4 ts=4: -- cgit From 096f56c6978a2d6570b0cc47016d344d5ef54a5a Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 26 Jan 2011 14:01:31 +0100 Subject: vcl2gnumake: #i116588# move vcl to gbuild (step 2) --- vcl/Module_vcl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/Module_vcl.mk') diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 5cb49b312507..636e5a3e367a 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ # FIXME: WiP # StaticLibrary_vclmain \ -ifeq ($(GUI),UNX) +ifeq ($(GUIBASE),unx) $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_gen \ Library_vclplug_svp \ -- cgit From 5a07595a428099575dcfe96a3cc54d136cbaba1b Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 26 Jan 2011 15:36:08 +0100 Subject: vcl2gnumake: #i116588# add static library for salmain --- vcl/Module_vcl.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'vcl/Module_vcl.mk') diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 636e5a3e367a..2d4306883796 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -31,9 +31,8 @@ $(eval $(call gb_Module_Module,vcl)) $(eval $(call gb_Module_add_targets,vcl,\ Library_vcl \ Package_inc \ + StaticLibrary_vclmain \ )) -# FIXME: WiP -# StaticLibrary_vclmain \ ifeq ($(GUIBASE),unx) $(eval $(call gb_Module_add_targets,vcl,\ -- cgit From 3afc7558eb03b88fd6041ef9fa530651f8468191 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 26 Jan 2011 19:18:52 +0100 Subject: vcl2gnumake: #i116588# move vcl to gbuild (step 3,linux,solaris,macos) --- vcl/Module_vcl.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'vcl/Module_vcl.mk') diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 2d4306883796..db2941976270 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ Library_vcl \ Package_inc \ StaticLibrary_vclmain \ + AllLangResTarget_vcl \ )) ifeq ($(GUIBASE),unx) -- cgit From 3465a97f4a786423bb8d86ef666da430337878e4 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 28 Jan 2011 13:43:38 +0100 Subject: vcl2gnumake: #i116588# add zip file for macos (preliminary) --- vcl/Module_vcl.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'vcl/Module_vcl.mk') diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index db2941976270..ff35aadd574c 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -59,5 +59,11 @@ $(eval $(call gb_Module_add_targets,vcl,\ endif endif +ifeq ($(GUIBASE),aqua) +$(eval $(call gb_Module_add_targets,vcl,\ + Package_osx \ +)) +endif + # vim: set noet sw=4 ts=4: -- cgit From 4617694b3fd830c8560f8d75d5f6afca618a8d65 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 23 Mar 2011 17:32:53 +0100 Subject: vcl2gnumake: #i116588# add: windows native resource files, cleanup (thanks hjs !) --- vcl/Module_vcl.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'vcl/Module_vcl.mk') diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index ff35aadd574c..929f60988bb1 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -30,8 +30,8 @@ $(eval $(call gb_Module_Module,vcl)) $(eval $(call gb_Module_add_targets,vcl,\ Library_vcl \ - Package_inc \ StaticLibrary_vclmain \ + Package_inc \ AllLangResTarget_vcl \ )) @@ -65,5 +65,10 @@ $(eval $(call gb_Module_add_targets,vcl,\ )) endif +ifeq ($(GUIBASE),WIN) +$(eval $(call gb_Module_add_targets,vcl,\ + WinResTarget_vcl \ +)) +endif # vim: set noet sw=4 ts=4: -- cgit