summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-02-28 08:52:07 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-02-28 13:33:47 +0100
commit8546e4180d0ea21af2033bf5888e16e3018a764e (patch)
tree120dcf46cb2a98e3a9cf48dbfeeb905d716d0fa1
parent264a2fdcacd1d2725ece59ba8352857aa0a7f15f (diff)
Unused SAL_UDK_MAJOR/MINOR/MICRO macros (unused sal/udkversion.h)
Change-Id: Iac16e28979e7d6ae7e0502588f6216d9bfa51eda
-rw-r--r--config_host/config_udkversion.h.in14
-rw-r--r--configure.ac4
-rw-r--r--sal/ZipPackage_sal_generated.mk2
3 files changed, 0 insertions, 20 deletions
diff --git a/config_host/config_udkversion.h.in b/config_host/config_udkversion.h.in
deleted file mode 100644
index 00f9bb89e87d..000000000000
--- a/config_host/config_udkversion.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-
- UDK version.
-
-*/
-
-#ifndef CONFIG_UDKVERSION_H
-#define CONFIG_UDKVERSION_H
-
-#undef SAL_UDK_MAJOR
-#undef SAL_UDK_MINOR
-#undef SAL_UDK_MICRO
-
-#endif
diff --git a/configure.ac b/configure.ac
index 9b77395fdeb8..047337a8d295 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4185,9 +4185,6 @@ UDK_MICRO=7
AC_SUBST(UDK_MAJOR)
AC_SUBST(UDK_MINOR)
AC_SUBST(UDK_MICRO)
-AC_DEFINE_UNQUOTED(SAL_UDK_MAJOR,"$UDK_MAJOR")
-AC_DEFINE_UNQUOTED(SAL_UDK_MINOR,"$UDK_MINOR")
-AC_DEFINE_UNQUOTED(SAL_UDK_MICRO,"$UDK_MICRO")
set `echo AC_PACKAGE_VERSION | sed "s/\./ /g"`
@@ -11846,7 +11843,6 @@ AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h])
AC_CONFIG_HEADERS([config_host/config_telepathy.h])
AC_CONFIG_HEADERS([config_host/config_typesizes.h])
-AC_CONFIG_HEADERS([config_host/config_udkversion.h])
AC_CONFIG_HEADERS([config_host/config_vclplug.h])
AC_CONFIG_HEADERS([config_host/config_version.h])
AC_OUTPUT
diff --git a/sal/ZipPackage_sal_generated.mk b/sal/ZipPackage_sal_generated.mk
index d6ffde7f1b84..c741cbc2a476 100644
--- a/sal/ZipPackage_sal_generated.mk
+++ b/sal/ZipPackage_sal_generated.mk
@@ -29,8 +29,6 @@ $(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_$(gb_Sid
$(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/udkversion.h,include/sal/udkversion.h,config_udkversion.h))
-
$(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: