Unused UDK_MAJOR/MINOR/MICRO macros (and udkversion.mk), also removed from SDK

Change-Id: I466424c5b71de4d6bb126499895539813283502a

6 files changed, 1 insertions, 34 deletions

diff --git a/config_host/.gitignore b/config_host/.gitignore
index e62c650e32d8..9becb5b61647 100644
--- a/config_host/.gitignore
+++ b/config_host/.gitignore
@@ -1,2 +1 @@
 config_*.h
-udkversion.mk
diff --git a/config_host/udkversion.mk.in b/config_host/udkversion.mk.in
deleted file mode 100644
index 7bd445f5fc45..000000000000
--- a/config_host/udkversion.mk.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# UDK version number
-
-UDK_MAJOR=@UDK_MAJOR@
-UDK_MINOR=@UDK_MINOR@
-UDK_MICRO=@UDK_MICRO@
-
diff --git a/configure.ac b/configure.ac
index 047337a8d295..c4c221cecefd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4108,7 +4108,6 @@ if test "$cross_compiling" = "yes"; then
     cp config.log ../config.Build.log
     mkdir -p ../config_build
     cp config_host/*.h ../config_build
-    cp config_host/udkversion.mk ../config_build
     . ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR
 
     for V in COM GUI OS CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
@@ -4178,14 +4177,6 @@ dnl ===================================================================
 dnl Our version is defined by the AC_INIT() at the top of this script.
 dnl ===================================================================
 
-UDK_MAJOR=3
-UDK_MINOR=2
-UDK_MICRO=7
-
-AC_SUBST(UDK_MAJOR)
-AC_SUBST(UDK_MINOR)
-AC_SUBST(UDK_MICRO)
-
 set `echo AC_PACKAGE_VERSION | sed "s/\./ /g"`
 
 LIBO_VERSION_MAJOR=$1
@@ -11837,7 +11828,7 @@ if test -f config_host.mk; then
     config_md5=`$MD5SUM config_host.mk | sed "s/ .*//"`
 fi
 
-AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk config_host/udkversion.mk instsetoo_native/util/openoffice.lst])
+AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk instsetoo_native/util/openoffice.lst])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_global.h])
 AC_CONFIG_HEADERS([config_host/config_graphite.h])
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index be1ec1efef89..c66e1dd65a14 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -9,9 +9,6 @@
 
 $(eval $(call gb_Module_Module,odk))
 
-# needed in several makefiles here
-include $(BUILDDIR)/config_host/udkversion.mk
-
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_odkcommon \
 	$(if $(filter WNT,$(OS)),CustomTarget_cli) \
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index eecde50d828d..58abdd561601 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -193,9 +193,6 @@ URLPREFIX=file://
 COMID=gcc3
 CPPU_ENV=gcc3
 
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
 #SALLIB=-luno_sal
 #CPPULIB=-luno_cppu
 #CPPUHELPERLIB=-luno_cppuhelperC52
@@ -326,9 +323,6 @@ DELRECURSIVE=rm -rf
 COPY=cp
 URLPREFIX=file://
 
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
 SALLIB=-luno_sal
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
@@ -438,9 +432,6 @@ DELRECURSIVE=rm -rf
 COPY=cp
 URLPREFIX=file://
 
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
 SALLIB=-luno_sal
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
@@ -561,9 +552,6 @@ DELRECURSIVE=rm -rf
 COPY=cp
 URLPREFIX=file://
 
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
 SALLIB=-luno_sal
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
diff --git a/sal/ZipPackage_sal_generated.mk b/sal/ZipPackage_sal_generated.mk
index c741cbc2a476..0cd7442f445e 100644
--- a/sal/ZipPackage_sal_generated.mk
+++ b/sal/ZipPackage_sal_generated.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_$(gb_Side)))
 
-$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/udkversion.mk,include/udkversion.mk,udkversion.mk))
-
 $(eval $(call gb_ZipPackage_add_file,sal_generated,inc/sal/typesizes.h,include/sal/typesizes.h,config_typesizes.h))
 
 # vim: set noet sw=4 ts=4: