summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-09-21 09:06:07 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-09-21 18:16:42 +0200
commitb403695bee563b54cd37e09a7b11b95a21a94958 (patch)
treec777fe6e9ca2b932bb24d3f366f3ac7330885de6
parent8ac8103e8ad317ba052312ff199f01b7a8f4fe43 (diff)
Directly use version.lst instead of versionlist.mk.
-rw-r--r--solenv/inc/versionlist.mk30
-rwxr-xr-xsolenv/makefile.mk2
2 files changed, 1 insertions, 31 deletions
diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk
deleted file mode 100644
index 672df7bd7602..000000000000
--- a/solenv/inc/versionlist.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-
-.INCLUDE: version.lst
-
-.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO OOOBASEVERSIONDAY OOOBASEVERSIONMONTH OOOBASEVERSIONYEAR
diff --git a/solenv/makefile.mk b/solenv/makefile.mk
index c4a2d0893d7c..54d67dbfe2c7 100755
--- a/solenv/makefile.mk
+++ b/solenv/makefile.mk
@@ -32,7 +32,7 @@ TARGET=init
# --- Settings ----------------------------------
.INCLUDE : settings.mk
.INCLUDE : target.mk
-.INCLUDE : versionlist.mk
+.INCLUDE : version.lst
ALLTAR : $(INCCOM)/versionlist.hrc