diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:00:48 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-14 23:00:48 +0100 |
| commit | 2b7675c9b0b3fe6accea195d6f009706c0d114ad (patch) | |
| tree | d8004c2ba451a30a234d19c6978530d923d37e88 /toolkit/Library_tk.mk | |
| parent | ac2741f0361ea516ffe8ead57a6e43665ec99937 (diff) | |
| parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) | |
gridsort: pulled and merged DEV300_m100
Diffstat (limited to 'toolkit/Library_tk.mk')
| -rw-r--r-- | toolkit/Library_tk.mk | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 7d2ab7451d34..caf1c045be03 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 # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # @@ -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 \ )) @@ -57,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,tk,\ tl \ utl \ vcl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,tk,\ @@ -168,29 +167,7 @@ endif ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_linked_libs,tk,\ X11 \ - dl \ - m \ - pthread \ )) 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: |