summaryrefslogtreecommitdiffstats
path: root/solenv/inc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-02-27 16:00:00 +0100
committerMichael Stahl <mstahl@redhat.com>2013-02-27 17:09:48 +0100
commit94d7c1e4a1de95be0211eaea3c8733a6205384e9 (patch)
treeb918aed2c94906938c213d4962e0878920ec1e8c /solenv/inc
parentremove odk/CustomTarget_include.mk and package udkversion.mk in sal (diff)
downloadcore-94d7c1e4a1de95be0211eaea3c8733a6205384e9.tar.gz
core-94d7c1e4a1de95be0211eaea3c8733a6205384e9.zip
remove solenv/inc/udkversion.mk
Change-Id: I57280e4488c89c5289c5c51e5dbc43deb82c7483
Diffstat (limited to 'solenv/inc')
-rw-r--r--solenv/inc/settings.mk2
-rw-r--r--solenv/inc/udkversion.mk24
2 files changed, 1 insertions, 25 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 097cb7f68dfa..26af726df98a 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -54,7 +54,7 @@ WRONG_SOURCEVERSION
# $(UPD)minor.mk could be empty as it's contents were already included from minor.mk
.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk
-.INCLUDE : udkversion.mk
+.INCLUDE : $(BUILDDIR)/config_host/udkversion.mk
# --- reset defined Environments --------------------
ASM=
diff --git a/solenv/inc/udkversion.mk b/solenv/inc/udkversion.mk
deleted file mode 100644
index 76d14a96ac39..000000000000
--- a/solenv/inc/udkversion.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# 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 .
-#
-
-# major
-UDK_MAJOR=3
-# minor
-UDK_MINOR=2
-# micro
-UDK_MICRO=7