diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-27 15:48:07 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-27 17:09:46 +0100 |
| commit | f413decfefcd57d487a979aaacf3583efc9eb9c5 (patch) | |
| tree | f42b8f1a3485a1711f325782deb2c216a10578f5 | |
| parent | 960e2ee691f99d516fc8e4fc10f13f2d29a41a8c (diff) | |
move generation of udkversion.mk to configure
Change-Id: Id2f047686e2ba3ac2d8242d9b47abad751679759
| -rw-r--r-- | config_host/.gitignore | 1 | ||||
| -rw-r--r-- | config_host/config_udkversion.h.in | 2 | ||||
| -rw-r--r-- | config_host/udkversion.mk.in | 6 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | odk/CustomTarget_include.mk | 8 |
5 files changed, 13 insertions, 9 deletions
diff --git a/config_host/.gitignore b/config_host/.gitignore index 9becb5b61647..e62c650e32d8 100644 --- a/config_host/.gitignore +++ b/config_host/.gitignore @@ -1 +1,2 @@ config_*.h +udkversion.mk diff --git a/config_host/config_udkversion.h.in b/config_host/config_udkversion.h.in index ff974e8020ee..00f9bb89e87d 100644 --- a/config_host/config_udkversion.h.in +++ b/config_host/config_udkversion.h.in @@ -1,4 +1,4 @@ -/* +/* UDK version. diff --git a/config_host/udkversion.mk.in b/config_host/udkversion.mk.in new file mode 100644 index 000000000000..7bd445f5fc45 --- /dev/null +++ b/config_host/udkversion.mk.in @@ -0,0 +1,6 @@ +# UDK version number + +UDK_MAJOR=@UDK_MAJOR@ +UDK_MINOR=@UDK_MINOR@ +UDK_MICRO=@UDK_MICRO@ + diff --git a/configure.ac b/configure.ac index 0064e834eb49..4d41a4106f94 100644 --- a/configure.ac +++ b/configure.ac @@ -4181,6 +4181,9 @@ UDK_MAJOR=3 UDK_MINOR=2 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") @@ -11873,7 +11876,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 instsetoo_native/util/openoffice.lst]) +AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk config_host/udkversion.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/CustomTarget_include.mk b/odk/CustomTarget_include.mk index c8a12c33a83d..8f5cd974308a 100644 --- a/odk/CustomTarget_include.mk +++ b/odk/CustomTarget_include.mk @@ -15,12 +15,6 @@ odkcommon_ZIPLIST += include/udkversion.mk $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/include,include/udkversion.mk)) $(odk_WORKDIR)/include/udkversion.mk: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo "#UDK version number" > $@ - echo "#major" >>$@ - echo "UDK_MAJOR=$(UDK_MAJOR)" >> $@ - echo "#minor" >>$@ - echo "UDK_MINOR=$(UDK_MINOR)" >> $@ - echo "#micro" >>$@ - echo "UDK_MICRO=$(UDK_MICRO)" >> $@ + cp $(BUILDDIR)/config_host/udkversion.mk $@ # vim: set noet sw=4 ts=4: |