diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-21 14:26:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-21 14:26:22 +0100 |
| commit | e5a5e3d34a91748bab3bc3d47c6b13227d011b6f (patch) | |
| tree | 323f4ccede289e1e44047d45f3960cbc0fa62c5a /tools | |
| parent | bbdac4192d1959552d656310aeb71759a874e005 (diff) | |
Dispatch to platform-specific strm*.cxx directly in Library_tl.mk
Change-Id: Ief526a06034b2408326273e43bec3b43a415b996
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Library_tl.mk | 10 | ||||
| -rw-r--r-- | tools/source/stream/strmsys.cxx | 26 |
2 files changed, 9 insertions, 27 deletions
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 6ebf57ef40b5..b50537c7a431 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -79,11 +79,19 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/ref/pstm \ tools/source/ref/ref \ tools/source/stream/stream \ - tools/source/stream/strmsys \ tools/source/stream/vcompat \ tools/source/string/tenccvt \ tools/source/zcodec/zcodec \ )) +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_exception_objects,tl, \ + tools/source/stream/strmwnt \ +)) +else +$(eval $(call gb_Library_add_exception_objects,tl, \ + tools/source/stream/strmunx \ +)) +endif $(eval $(call gb_Library_add_generated_exception_objects,tl,\ CustomTarget/tools/string/reversemap \ diff --git a/tools/source/stream/strmsys.cxx b/tools/source/stream/strmsys.cxx deleted file mode 100644 index 61c74648e18b..000000000000 --- a/tools/source/stream/strmsys.cxx +++ /dev/null @@ -1,26 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#if defined(_WIN32) -#include "strmwnt.cxx" -#elif defined UNX -#include "strmunx.cxx" -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |