From 298c69d56e6dae8c503b19913b7186d6db829b92 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 15 Oct 2013 23:23:29 +0300 Subject: Generate the ios/lo.xcconfig at configure time Also, add INSTDIR and WORKDIR. Change-Id: I16266202c2e2d005533f7ffbcc2ae41f63833928 --- configure.ac | 6 ++++-- ios/.gitignore | 9 +++++++++ ios/lo.xcconfig.in | 11 +++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ios/.gitignore create mode 100644 ios/lo.xcconfig.in diff --git a/configure.ac b/configure.ac index 0375a34abae8..04c62706643b 100644 --- a/configure.ac +++ b/configure.ac @@ -4460,7 +4460,8 @@ if test "$cross_compiling" = "yes"; then lo.xcent.in \ instsetoo_native/util/openoffice.lst.in \ config_host/*.in \ - sysui/desktop/macosx/Info.plist.in) \ + sysui/desktop/macosx/Info.plist.in \ + ios/lo.xcconfig.in) \ | (cd CONF-FOR-BUILD && tar xf -) cp configure CONF-FOR-BUILD test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null @@ -12630,7 +12631,8 @@ AC_CONFIG_FILES([config_host.mk Makefile lo.xcent instsetoo_native/util/openoffice.lst - sysui/desktop/macosx/Info.plist]) + sysui/desktop/macosx/Info.plist + ios/lo.xcconfig]) AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_features.h]) diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 000000000000..08c6a6864eb9 --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,9 @@ +# +# 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/. +# + +/lo.xcconfig diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in new file mode 100644 index 000000000000..4f3183cd2796 --- /dev/null +++ b/ios/lo.xcconfig.in @@ -0,0 +1,11 @@ +// -*- Mode: make; 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/. + +BUILDDIR = @BUILDDIR@ +INSTDIR = @INSTDIR@ +WORKDIR = @WORKDIR@ -- cgit