diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-08-04 16:32:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-08-04 16:32:43 +0200 |
| commit | c240e18cddbef2bc3eda6210e02b9dc274b59728 (patch) | |
| tree | c374eba889f0a616c9cfe2146256b52b2822d415 /tools | |
| parent | 6f339a64fa98a3517dca2f6aae8bbe2b176382aa (diff) | |
gnumake2: added static ooopathutils lib
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Module_tools.mk | 3 | ||||
| -rwxr-xr-x | tools/StaticLibrary_ooopathutils.mk | 51 | ||||
| -rw-r--r-- | tools/source/misc/pathutils.cxx | 1 |
3 files changed, 52 insertions, 3 deletions
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk index 447aba59cb50..bba1d8240cdf 100644 --- a/tools/Module_tools.mk +++ b/tools/Module_tools.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,tools,\ Executable_sspretty \ Library_tl \ Package_inc \ + StaticLibrary_ooopathutils \ )) # TODO: @@ -45,8 +46,6 @@ $(eval $(call gb_Module_add_targets,tools,\ #COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a #COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a #COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib -#COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj -#COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj #todo: link tools dynamically everywhere #todo: ALWAYSDBGFLAG etc. diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk new file mode 100755 index 000000000000..914b478345d7 --- /dev/null +++ b/tools/StaticLibrary_ooopathutils.mk @@ -0,0 +1,51 @@ +#************************************************************************* +# +# 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_StaticLibrary_StaticLibrary,ooopathutils)) + +$(eval $(call gb_StaticLibrary_add_package_headers,ooopathutils,tools_inc)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\ + tools/source/misc/pathutils \ +)) + + +# HACK for now +define StaticLibrary_ooopathutils_hack +$(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1) + +$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils) + cp -f $$< $$@ + +endef + +ifeq ($(OS),WNT) +$(eval $(call StaticLibrary_ooopathutils_hack,pathutils-obj.obj)) +else +$(eval $(call StaticLibrary_ooopathutils_hack,pathutils-obj.o)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/source/misc/pathutils.cxx b/tools/source/misc/pathutils.cxx index 397bade136e7..4685f96ca187 100644 --- a/tools/source/misc/pathutils.cxx +++ b/tools/source/misc/pathutils.cxx @@ -25,7 +25,6 @@ * ************************************************************************/ -#include "precompiled_tools.hxx" #include "sal/config.h" #if defined WNT |