diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-10 17:42:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-10 17:56:24 +0200 |
| commit | 09373d45838e4dab514e37dee4a4c8f6218ebda0 (patch) | |
| tree | 91381d15cb0c7b29072c79a30eee7fd0d8635768 /soltools | |
| parent | 76d098a07bb2f901948d39522954dff6b50adae8 (diff) | |
soltools: remove Package_inc and empty unistd.h nonsense
Change-Id: Ic05de69951b28b9cc8d62f0a534b507c424e6b25
Diffstat (limited to 'soltools')
| -rw-r--r-- | soltools/Executable_cpp.mk | 4 | ||||
| -rw-r--r-- | soltools/Executable_makedepend.mk | 4 | ||||
| -rw-r--r-- | soltools/Module_soltools.mk | 6 | ||||
| -rw-r--r-- | soltools/Package_inc.mk | 11 | ||||
| -rw-r--r-- | soltools/mkdepend/def.h | 2 | ||||
| -rw-r--r-- | soltools/winunistd/unistd.h | 6 |
6 files changed, 2 insertions, 31 deletions
diff --git a/soltools/Executable_cpp.mk b/soltools/Executable_cpp.mk index f24b0185fd32..4225319ab462 100644 --- a/soltools/Executable_cpp.mk +++ b/soltools/Executable_cpp.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Executable_Executable,cpp)) -$(eval $(call gb_Executable_use_externals,cpp,\ - unistd_headers \ -)) - $(eval $(call gb_Executable_add_cobjects,cpp,\ soltools/cpp/_cpp \ soltools/cpp/_eval \ diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk index e924a8d0fec6..ff61f40c4cc9 100644 --- a/soltools/Executable_makedepend.mk +++ b/soltools/Executable_makedepend.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_defs,makedepend,\ -DHW_THREADS \ )) -$(eval $(call gb_Executable_use_externals,makedepend,\ - unistd_headers \ -)) - ifeq ($(COM),MSC) $(eval $(call gb_Executable_add_defs,makedepend,\ -wd4100 \ diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk index 77396fdce844..df617450a7d6 100644 --- a/soltools/Module_soltools.mk +++ b/soltools/Module_soltools.mk @@ -14,10 +14,4 @@ $(eval $(call gb_Module_add_targets_for_build,soltools,\ Executable_makedepend \ )) -ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_Module_add_targets,soltools,\ - Package_inc \ -)) -endif # WNTMSC - # vim:set noet sw=4 ts=4: diff --git a/soltools/Package_inc.mk b/soltools/Package_inc.mk deleted file mode 100644 index 863945fe63f6..000000000000 --- a/soltools/Package_inc.mk +++ /dev/null @@ -1,11 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,soltools_inc,$(SRCDIR)/soltools/winunistd)) -$(eval $(call gb_Package_add_file,soltools_inc,inc/unistd.h,unistd.h)) diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h index 1c0e91a811c9..dcb3c1ff923d 100644 --- a/soltools/mkdepend/def.h +++ b/soltools/mkdepend/def.h @@ -40,7 +40,9 @@ in this Software without prior written authorization from the X Consortium. #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifndef _MSC_VER #include <unistd.h> +#endif #include <ctype.h> #ifndef X_NOT_POSIX diff --git a/soltools/winunistd/unistd.h b/soltools/winunistd/unistd.h deleted file mode 100644 index 72c253e0af41..000000000000 --- a/soltools/winunistd/unistd.h +++ /dev/null @@ -1,6 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* Dummy unistd.h for the wntmsci3 environment. Required because flex - * generates a lexical scanner which includes <unistd.h> - */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |