From f51c9e5db1b84ce92bb75d3a5faf6ebe9ef5dcc9 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: CWS gnumake2: module reorg --- toolkit/Library_tk.mk | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 toolkit/Library_tk.mk (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk new file mode 100644 index 000000000000..60d13418fa5b --- /dev/null +++ b/toolkit/Library_tk.mk @@ -0,0 +1,172 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,tk)) + +$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc)) + +#$(eval $(call gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit)) + +$(eval $(call gb_Library_set_include,tk,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/toolkit/ \ + -I$(SRCDIR)/toolkit/inc \ + -I$(SRCDIR)/toolkit/inc/pch \ + -I$(SRCDIR)/toolkit/source \ + -I$(OUTDIR)/inc/toolkit \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,tk,\ + $$(DEFS) \ + -DTOOLKIT_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,tk,\ + comphelper \ + stl \ + tl \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,tk,\ + toolkit/source/awt/asynccallback \ + toolkit/source/awt/vclxaccessiblecomponent \ + toolkit/source/awt/vclxbitmap \ + toolkit/source/awt/vclxbutton \ + toolkit/source/awt/vclxcontainer \ + toolkit/source/awt/vclxdevice \ + toolkit/source/awt/vclxdialog \ + toolkit/source/awt/vclxfixedline \ + toolkit/source/awt/vclxfont \ + toolkit/source/awt/vclxgraphics \ + toolkit/source/awt/vclxmenu \ + toolkit/source/awt/vclxplugin \ + toolkit/source/awt/vclxpointer \ + toolkit/source/awt/vclxprinter \ + toolkit/source/awt/vclxregion \ + toolkit/source/awt/vclxscroller \ + toolkit/source/awt/vclxspinbutton \ + toolkit/source/awt/vclxsplitter \ + toolkit/source/awt/vclxsystemdependentwindow \ + toolkit/source/awt/vclxtabcontrol \ + toolkit/source/awt/vclxtabpage \ + toolkit/source/awt/vclxtoolkit \ + toolkit/source/awt/vclxtopwindow \ + toolkit/source/awt/vclxwindow \ + toolkit/source/awt/vclxwindow1 \ + toolkit/source/awt/vclxwindows \ + toolkit/source/awt/xsimpleanimation \ + toolkit/source/awt/xthrobber \ + toolkit/source/controls/accessiblecontrolcontext \ + toolkit/source/controls/dialogcontrol \ + toolkit/source/controls/eventcontainer \ + toolkit/source/controls/formattedcontrol \ + toolkit/source/controls/geometrycontrolmodel \ + toolkit/source/controls/grid/defaultgridcolumnmodel \ + toolkit/source/controls/grid/defaultgriddatamodel \ + toolkit/source/controls/grid/gridcolumn \ + toolkit/source/controls/grid/gridcontrol \ + toolkit/source/controls/roadmapcontrol \ + toolkit/source/controls/roadmapentry \ + toolkit/source/controls/stdtabcontroller \ + toolkit/source/controls/stdtabcontrollermodel \ + toolkit/source/controls/tkscrollbar \ + toolkit/source/controls/tksimpleanimation \ + toolkit/source/controls/tkspinbutton \ + toolkit/source/controls/tkthrobber \ + toolkit/source/controls/tree/treecontrol \ + toolkit/source/controls/tree/treedatamodel \ + toolkit/source/controls/unocontrol \ + toolkit/source/controls/unocontrolbase \ + toolkit/source/controls/unocontrolcontainer \ + toolkit/source/controls/unocontrolcontainermodel \ + toolkit/source/controls/unocontrolmodel \ + toolkit/source/controls/unocontrols \ + toolkit/source/helper/accessibilityclient \ + toolkit/source/helper/externallock \ + toolkit/source/helper/fixedhyperbase \ + toolkit/source/helper/formpdfexport \ + toolkit/source/helper/imagealign \ + toolkit/source/helper/listenermultiplexer \ + toolkit/source/helper/property \ + toolkit/source/helper/registerservices \ + toolkit/source/helper/servicenames \ + toolkit/source/helper/throbberimpl \ + toolkit/source/helper/tkresmgr \ + toolkit/source/helper/unomemorystream \ + toolkit/source/helper/unopropertyarrayhelper \ + toolkit/source/helper/unowrapper \ + toolkit/source/helper/vclunohelper \ + toolkit/source/layout/core/bin \ + toolkit/source/layout/core/box \ + toolkit/source/layout/core/box-base \ + toolkit/source/layout/core/byteseq \ + toolkit/source/layout/core/container \ + toolkit/source/layout/core/dialogbuttonhbox \ + toolkit/source/layout/core/factory \ + toolkit/source/layout/core/flow \ + toolkit/source/layout/core/helper \ + toolkit/source/layout/core/import \ + toolkit/source/layout/core/localized-string \ + toolkit/source/layout/core/proplist \ + toolkit/source/layout/core/root \ + toolkit/source/layout/core/table \ + toolkit/source/layout/core/timer \ + toolkit/source/layout/core/translate \ + toolkit/source/layout/core/vcl \ + toolkit/source/layout/vcl/wbutton \ + toolkit/source/layout/vcl/wcontainer \ + toolkit/source/layout/vcl/wfield \ + toolkit/source/layout/vcl/wrapper \ +)) + +ifeq ($(GUIBASE),aqua) +$(eval $(call gb_Library_set_cxxflags,tk,\ + $$(CXXFLAGS) $(gb_OBJCXXFLAGS))) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,tk,\ + X11 \ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,tk,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: -- cgit From 91e34e4ccc6c61d0b64d250817af7f0d2263b89e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 29 Oct 2010 15:36:30 +0200 Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux --- toolkit/Library_tk.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 60d13418fa5b..7fe38ac64dc7 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -84,6 +84,7 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/vclxwindow \ toolkit/source/awt/vclxwindow1 \ toolkit/source/awt/vclxwindows \ + toolkit/source/awt/stylesettings \ toolkit/source/awt/xsimpleanimation \ toolkit/source/awt/xthrobber \ toolkit/source/controls/accessiblecontrolcontext \ -- cgit From 245e3ab75fd3aa3dd557dab37e9691f33bd023b1 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 6 Nov 2010 15:58:44 +0100 Subject: gnumake2: added component registration --- toolkit/Library_tk.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 7fe38ac64dc7..eadd87b77322 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,tk)) +$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk)) + $(eval $(call gb_Library_add_package_headers,tk,toolkit_inc)) #$(eval $(call gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit)) -- cgit From d2e5e59c6b28235a832cdc06480e30f0ed96b580 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 26 Nov 2010 13:37:22 +0100 Subject: gnumake2: sorting all lists in makefiles --- toolkit/Library_tk.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index eadd87b77322..9d94c76314f1 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -50,17 +50,18 @@ $(eval $(call gb_Library_set_defs,tk,\ $(eval $(call gb_Library_add_linked_libs,tk,\ comphelper \ - stl \ - tl \ cppu \ cppuhelper \ sal \ + stl \ + tl \ utl \ vcl \ )) $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/asynccallback \ + toolkit/source/awt/stylesettings \ toolkit/source/awt/vclxaccessiblecomponent \ toolkit/source/awt/vclxbitmap \ toolkit/source/awt/vclxbutton \ @@ -86,7 +87,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/vclxwindow \ toolkit/source/awt/vclxwindow1 \ toolkit/source/awt/vclxwindows \ - toolkit/source/awt/stylesettings \ toolkit/source/awt/xsimpleanimation \ toolkit/source/awt/xthrobber \ toolkit/source/controls/accessiblecontrolcontext \ -- cgit From e389e3aef4fddf06a0e1e902802ad00f2e60905f Mon Sep 17 00:00:00 2001 From: tono Date: Fri, 31 Dec 2010 00:35:16 +0900 Subject: i#116264: gbuild for MinGW --- toolkit/Library_tk.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 9d94c76314f1..ab51c1e282bb 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -166,10 +166,23 @@ $(eval $(call gb_Library_add_linked_libs,tk,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,tk,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + mingwex \ + kernel32 \ + msvcrt \ +)) +else $(eval $(call gb_Library_add_linked_libs,tk,\ kernel32 \ msvcrt \ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: -- cgit From 719a761b4f8e71a5cf86d5c92bff0cb44be612c7 Mon Sep 17 00:00:00 2001 From: tono Date: Wed, 5 Jan 2011 21:38:47 +0900 Subject: Backed out changeset: e84942bd0aca --- toolkit/Library_tk.mk | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index ab51c1e282bb..9d94c76314f1 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -166,23 +166,10 @@ $(eval $(call gb_Library_add_linked_libs,tk,\ )) endif ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,tk,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -else $(eval $(call gb_Library_add_linked_libs,tk,\ kernel32 \ msvcrt \ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: -- cgit From 93d8027d3dc7d52fb96325601ee35562560c68d5 Mon Sep 17 00:00:00 2001 From: tono Date: Wed, 5 Jan 2011 22:55:15 +0900 Subject: mingwport33: i#116264: gbuild for MinGW --- toolkit/Library_tk.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 9d94c76314f1..ab51c1e282bb 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -166,10 +166,23 @@ $(eval $(call gb_Library_add_linked_libs,tk,\ )) endif ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,tk,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + mingwex \ + kernel32 \ + msvcrt \ +)) +else $(eval $(call gb_Library_add_linked_libs,tk,\ kernel32 \ msvcrt \ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: -- cgit From d6987b06b0e069a5276ff59d02b71c5fd5c5e626 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 6 Jan 2011 08:44:39 +0100 Subject: dba34b: adjusted CWS'es changes to new build system --- toolkit/Library_tk.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 9d94c76314f1..b54bee4e231d 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -82,6 +82,7 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/vclxsystemdependentwindow \ toolkit/source/awt/vclxtabcontrol \ toolkit/source/awt/vclxtabpage \ + toolkit/source/awt/animatedimagespeer \ toolkit/source/awt/vclxtoolkit \ toolkit/source/awt/vclxtopwindow \ toolkit/source/awt/vclxwindow \ @@ -106,6 +107,8 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/controls/tksimpleanimation \ toolkit/source/controls/tkspinbutton \ toolkit/source/controls/tkthrobber \ + toolkit/source/controls/animatedimages \ + toolkit/source/controls/spinningprogress \ toolkit/source/controls/tree/treecontrol \ toolkit/source/controls/tree/treedatamodel \ toolkit/source/controls/unocontrol \ @@ -123,7 +126,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/helper/property \ toolkit/source/helper/registerservices \ toolkit/source/helper/servicenames \ - toolkit/source/helper/throbberimpl \ toolkit/source/helper/tkresmgr \ toolkit/source/helper/unomemorystream \ toolkit/source/helper/unopropertyarrayhelper \ -- cgit From 54d9ea315aef1d774d728e6e8cbac3183def5f0e Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 25 Jan 2011 17:40:38 +0100 Subject: gridsort: post rebase (which was implicitly done by merging CWS dba34b): re-do changes in the new build system --- toolkit/Library_tk.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index b54bee4e231d..922f07aae53b 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -98,6 +98,8 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/controls/grid/defaultgridcolumnmodel \ toolkit/source/controls/grid/defaultgriddatamodel \ toolkit/source/controls/grid/gridcolumn \ + toolkit/source/controls/grid/grideventforwarder \ + toolkit/source/controls/grid/sortablegriddatamodel \ toolkit/source/controls/grid/gridcontrol \ toolkit/source/controls/roadmapcontrol \ toolkit/source/controls/roadmapentry \ -- cgit From 38ea83b7b499f2867fd37b113d5ffaa84326016c Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 25 Jan 2011 18:19:55 +0100 Subject: CWS gnumake3: fix license headers --- toolkit/Library_tk.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 9d94c76314f1..2ee9ce294090 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # # for a copy of the LGPLv3 License. # -- cgit From 6c0d17b3e21d4c0d6f6a526a6261f5ca8eb42369 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 26 Jan 2011 10:30:19 +0100 Subject: CWS gnumake3: several clean ups and fixes in makefiles --- toolkit/Library_tk.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 06d0377c5411..abf06ac8fa35 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -35,11 +35,9 @@ $(eval $(call gb_Library_add_package_headers,tk,toolkit_inc)) $(eval $(call gb_Library_set_include,tk,\ $$(INCLUDE) \ - -I$(WORKDIR)/inc/toolkit/ \ -I$(SRCDIR)/toolkit/inc \ -I$(SRCDIR)/toolkit/inc/pch \ -I$(SRCDIR)/toolkit/source \ - -I$(OUTDIR)/inc/toolkit \ -I$(OUTDIR)/inc/offuh \ )) -- cgit From 3f67c4efe6de48c2685e48ec1152f5391579815e Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Fri, 28 Jan 2011 11:49:55 +0100 Subject: tabcontrol: merge master --- toolkit/Library_tk.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index ab51c1e282bb..63fb5e0d03dd 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -82,6 +82,7 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/vclxsystemdependentwindow \ toolkit/source/awt/vclxtabcontrol \ toolkit/source/awt/vclxtabpage \ + toolkit/source/awt/vclxtabpagecontainer \ toolkit/source/awt/vclxtoolkit \ toolkit/source/awt/vclxtopwindow \ toolkit/source/awt/vclxwindow \ @@ -90,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/xsimpleanimation \ toolkit/source/awt/xthrobber \ toolkit/source/controls/accessiblecontrolcontext \ + toolkit/source/controls/controlmodelcontainerbase \ toolkit/source/controls/dialogcontrol \ toolkit/source/controls/eventcontainer \ toolkit/source/controls/formattedcontrol \ @@ -100,6 +102,8 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/controls/grid/gridcontrol \ toolkit/source/controls/roadmapcontrol \ toolkit/source/controls/roadmapentry \ + toolkit/source/controls/tabpagecontainer \ + toolkit/source/controls/tabpagemodel \ toolkit/source/controls/stdtabcontroller \ toolkit/source/controls/stdtabcontrollermodel \ toolkit/source/controls/tkscrollbar \ -- cgit From f7d5dd5f78289e1e0934d45262debd532432394f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 1 Feb 2011 18:44:12 +0100 Subject: CWS gnumake3: use standard linked libs on Windows --- toolkit/Library_tk.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index abf06ac8fa35..2ce5b1e8597c 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,tk,\ tl \ utl \ vcl \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,tk,\ @@ -175,12 +176,6 @@ $(eval $(call gb_Library_add_linked_libs,tk,\ kernel32 \ msvcrt \ )) -else -$(eval $(call gb_Library_add_linked_libs,tk,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) endif endif # vim: set noet sw=4 ts=4: -- cgit From 582eb5a368de1627164bc50e25f9eab8ae96e1a8 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 2 Feb 2011 17:05:04 +0100 Subject: CWS gnumake3: rename gb_StdLibs -> gb_STDLIBS; remove explicit linking of individual standard libs from makefiles; fix export problem in framework --- toolkit/Library_tk.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 2ce5b1e8597c..d2a988928efb 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,tk,\ tl \ utl \ vcl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,tk,\ @@ -159,9 +159,6 @@ endif ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_linked_libs,tk,\ X11 \ - dl \ - m \ - pthread \ )) endif ifeq ($(OS),WNT) -- cgit From ec283a532c1a30270f41f3f57c6c0ff3612a11d3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 3 Feb 2011 10:24:18 +0100 Subject: CWS gnumake3: clean up mingw stuff after adding STDLIBS --- toolkit/Library_tk.mk | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'toolkit/Library_tk.mk') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index d2a988928efb..453a0aa473f8 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -161,18 +161,5 @@ $(eval $(call gb_Library_add_linked_libs,tk,\ X11 \ )) endif -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,tk,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -endif -endif + # vim: set noet sw=4 ts=4: -- cgit