bin i18npool/version.mk, hardcode the version

This makefile must be included from other makefiles, which means it must
be delivered first, which does not play so well with gbuild's
all-in-one-process build. Because the version has not changed once since
the library was introduced in 2006, I consider this just an unecessary
complication of already complex build process.

Change-Id: I8304f0e8ef9e59a046b10f423dbe61d75e3fc5c2

5 files changed, 3 insertions, 49 deletions

diff --git a/i18npool/Package_inc.mk b/i18npool/Package_inc.mk
index 9fd2f203822f..69eaf0c951ef 100644
--- a/i18npool/Package_inc.mk
+++ b/i18npool/Package_inc.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Package_Package,i18npool_inc,$(SRCDIR)/i18npool/inc))
 
-$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/version.mk,../version.mk))
-
 $(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/i18npooldllapi.h,i18npool/i18npooldllapi.h))
 $(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/lang.h,i18npool/lang.h))
 $(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/mslangid.hxx,i18npool/mslangid.hxx))
diff --git a/i18npool/version.mk b/i18npool/version.mk
deleted file mode 100644
index ebd51341b13f..000000000000
--- a/i18npool/version.mk
+++ /dev/null
@@ -1,40 +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.
-#
-#*************************************************************************
-
-# target
-ISOLANG_TARGET=i18nisolang
-
-# major 
-ISOLANG_MAJOR=1
-# minor 
-ISOLANG_MINOR=0
-# micro 
-ISOLANG_MICRO=0
-
-# this is a c++ library 
-ISOLANG_CPP=0
-
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 927c4e1d2f34..928edad55a3f 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -134,10 +134,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_ZLIB_DLL \
 ))
 
-include $(OUTDIR)/inc/i18npool/version.mk
-
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	-DISOLANG_MAJOR=$(ISOLANG_MAJOR) \
 	$(if $(filter MACOSX,$(OS)),\
 		-DENABLE_CAIROCANVAS \
 	) \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 0b4a78e1dfde..b2a6cbbf29c0 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -706,9 +706,9 @@ End
 
 File gid_File_Lib_I18nisolang
   #ifdef UNX
-    Name = STRING(CONCAT4(libi18nisolang,ISOLANG_MAJOR,COMID,UNXSUFFIX));
+    Name = STRING(CONCAT3(libi18nisolang1,COMID,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(i18nisolang,ISOLANG_MAJOR,COMID,.dll));
+    Name = STRING(CONCAT3(i18nisolang1,COMID,.dll));
   #endif
     PACKED_LIB_FILE_BODY;
 End
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index c8259bdad856..92f9e2223e56 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -26,7 +26,6 @@
 #*************************************************************************
 LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
 
-.INCLUDE .IGNORE : i18npool/version.mk
 .INCLUDE .IGNORE : comphelper/version.mk
 .INCLUDE .IGNORE : ucbhelper/version.mk
 .INCLUDE .IGNORE : connectivity/version.mk
@@ -67,7 +66,7 @@ ICUUCLIB=-licuuc
 ICUDATALIB=-licudata
 .ENDIF
 I18NUTILLIB=-li18nutil$(COMID)
-I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
+I18NISOLANGLIB=-li18nisolang1$(COMID)
 I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX)
 SALHELPERLIB=-luno_salhelper$(COMID_WITH_VERSION)
 XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX)