diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-27 15:06:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-27 17:09:45 +0100 |
| commit | fdd44e2d6ccb7db99185e76b1ed367b9cd24a090 (patch) | |
| tree | 4f9ea9c5081fc0d29793bc9b31f4e0d3bc470760 | |
| parent | sal: use typesizes.h in MSVC build too (diff) | |
| download | core-fdd44e2d6ccb7db99185e76b1ed367b9cd24a090.tar.gz core-fdd44e2d6ccb7db99185e76b1ed367b9cd24a090.zip | |
move generation of sal/udkversion.h to configure
Change-Id: I401dc6b3dcea933d1f186a8618e7c86ccd21430e
| -rw-r--r-- | config_host/config_udkversion.h.in | 14 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | sal/CustomTarget_generated.mk | 11 |
3 files changed, 24 insertions, 10 deletions
diff --git a/config_host/config_udkversion.h.in b/config_host/config_udkversion.h.in new file mode 100644 index 000000000000..ff974e8020ee --- /dev/null +++ b/config_host/config_udkversion.h.in @@ -0,0 +1,14 @@ +/* + + 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 1b5e662003a6..0064e834eb49 100644 --- a/configure.ac +++ b/configure.ac @@ -4177,6 +4177,14 @@ 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_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"` LIBO_VERSION_MAJOR=$1 @@ -11871,6 +11879,7 @@ 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/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk index 1828b63e7ef6..8b35da707891 100644 --- a/sal/CustomTarget_generated.mk +++ b/sal/CustomTarget_generated.mk @@ -37,17 +37,8 @@ $(sal_DIR)/sal/typesizes.h :| $(sal_DIR)/sal/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) cp $(SRCDIR)/config_host/config_typesizes.h $@ -include $(SRCDIR)/solenv/inc/udkversion.mk - $(sal_DIR)/sal/udkversion.h :| $(sal_DIR)/sal/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo '#ifndef _SAL_UDKVERSION_H_' > $@ - echo '#define _SAL_UDKVERSION_H_' >> $@ - echo '' >> $@ - echo '#define SAL_UDK_MAJOR "$(UDK_MAJOR)"' >> $@ - echo '#define SAL_UDK_MINOR "$(UDK_MINOR)"' >> $@ - echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@ - echo '' >> $@ - echo '#endif' >> $@ + cp $(SRCDIR)/config_host/config_udkversion.h $@ # vim: set noet sw=4 ts=4: |