Kaydet (Commit) bfdcde7c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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

Change-Id: I466424c5b71de4d6bb126499895539813283502a
üst 8546e418
# UDK version number
UDK_MAJOR=@UDK_MAJOR@
UDK_MINOR=@UDK_MINOR@
UDK_MICRO=@UDK_MICRO@
......@@ -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])
......
......@@ -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) \
......
......@@ -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)
......
......@@ -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:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment