vcl2gnumake: #i116588# move vcl to gbuild (step 3,linux,solaris,macos)

6 files changed, 77 insertions, 1 deletions

diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
new file mode 100644
index 000000000000..9a3453af2810
--- /dev/null
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -0,0 +1,54 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,vcl))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,vcl,vcl))
+
+$(eval $(call gb_AllLangResTarget_add_srs,vcl,\
+    vcl/source/src \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src))
+
+$(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
+        $$(INCLUDE) \
+        -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
+    vcl/source/src/btntext.src \
+    vcl/source/src/helptext.src \
+    vcl/source/src/images.src \
+    vcl/source/src/menu.src \
+    vcl/source/src/print.src \
+    vcl/source/src/stdtext.src \
+    vcl/source/src/units.src \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 487f9cce5754..8c90cb6ce165 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -27,6 +27,14 @@
 
 $(eval $(call gb_Library_Library,vcl))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
+else
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
+endif
+
 $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
 
 $(eval $(call gb_Library_add_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
@@ -89,7 +97,7 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\
     $$(CXXFLAGS) \
     $$(OBJCXXFLAGS) \
 ))
-$(eval $(call gb_Library_add_add_objcxxobjects,vcl,\
+$(eval $(call gb_Library_add_objcxxobjects,vcl,\
     vcl/aqua/source/a11y/aqua11yactionwrapper \
     vcl/aqua/source/a11y/aqua11ycomponentwrapper \
     vcl/aqua/source/a11y/aqua11yfactory \
@@ -389,6 +397,19 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
 ))
 endif
 
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    AppleRemote \
+))
+$(eval $(call gb_Library_set_ldflags,vcl,\
+    $$(LDFLAGS) \
+    -framework QuickTime \
+    -framework Cocoa \
+    -framework Carbon \
+    -framework CoreFoundation \
+))
+endif
+
 ifeq ($(OS),WNT)
 ifneq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
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)
diff --git a/vcl/util/vcl.macosx.component b/vcl/vcl.macosx.component
index 3aabcd8c7050..3aabcd8c7050 100644
--- a/vcl/util/vcl.macosx.component
+++ b/vcl/vcl.macosx.component
diff --git a/vcl/util/vcl.component b/vcl/vcl.unx.component
index da20fc916c32..da20fc916c32 100644
--- a/vcl/util/vcl.component
+++ b/vcl/vcl.unx.component
diff --git a/vcl/util/vcl.windows.component b/vcl/vcl.windows.component
index 72f7ace9f251..72f7ace9f251 100644
--- a/vcl/util/vcl.windows.component
+++ b/vcl/vcl.windows.component