autogenerate version.h from build system

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/.gitignore b/.gitignore
index 849265d830c64e1beb7532564709ef549a57863f..86aee630d92ed7448f9b83e9272db84fe80a4d1e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@
 #
 # Generated include files
 #
+/include/version.h
 
 # stgit generated dirs
 patches-*

diff --git a/Makefile b/Makefile
index bd5ada3dfc361dde92717936e1ed020f61394ba9..8f871c689b132efedcc95f0c806d68f584692c7f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 
 # -*- sh -*-
 
+VERSION = 1.4.5
+
 CPPFLAGS += -I./include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS)
 
 ifeq ($(WITHOUT_XATTR), 1)
@@ -36,6 +38,8 @@ TARGETS = $(BINS)
 TARGETS += lib/libmtd.a
 TARGETS += ubi-utils/libubi.a
 
+OBJDEPS = $(BUILDDIR)/include/version.h
+
 include common.mk
 
 clean::
@@ -49,6 +53,7 @@ endif
        find $(BUILDDIR)/ -xdev \
                '(' -name '*.[ao]' -o -name '.*.c.dep' ')' \
                -exec rm -f {} +
+       rm -f $(BUILDDIR)/include/version.h
        $(MAKE) -C $(TESTS) clean
 
 install:: ${BINS} ${SCRIPTS}
@@ -63,6 +68,11 @@ tests::
 cscope:
        cscope -bR
 
+$(BUILDDIR)/include/version.h: $(BUILDDIR)/include/version.h.tmp
+       $(Q)cmp -s $@ $@.tmp && rm -f $@.tmp || mv $@.tmp $@
+$(BUILDDIR)/include/version.h.tmp:
+       $(Q)echo '#define VERSION "$(VERSION)"' > $@
+
 #
 # Utils in top level
 #

diff --git a/common.mk b/common.mk
index d0e207dbc2d86ac6248cc9e3290b48b3b039d8bd..ba87377a00b659b605ba20d3ada9e32c358789fe 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -75,7 +75,7 @@ $(BUILDDIR)/%.a:
        $(Q)$(AR) cr $@ $^
        $(Q)$(RANLIB) $@
 
-$(BUILDDIR)/%.o: %.c
+$(BUILDDIR)/%.o: %.c $(OBJDEPS)
 ifneq ($(BUILDDIR),$(CURDIR))
        $(Q)mkdir -p $(dir $@)
 endif

diff --git a/flash_erase.c b/flash_erase.c
index e0d2d4cb8ba45fde61e300f47384d9a64a4d6fe8..220f85a3114ccce3c3c856f4f4e33eb8f00407e7 100644 (file)
--- a/flash_erase.c
+++ b/flash_erase.c
@@ -19,7 +19,6 @@
  */
 
 #define PROGRAM_NAME "flash_erase"
-#define VERSION "2.1.0"
 
 #include <inttypes.h>
 #include <stdio.h>

diff --git a/include/common.h b/include/common.h
index 7ea282c81373f237e8bd9b90cc4ca000371af372..65ec0860fd6b491b46dc29776d7bfd6ce0ae24e1 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
+#include "version.h"
 
 #ifndef PROGRAM_NAME
 # error "You must define PROGRAM_NAME before including this header"

diff --git a/nanddump.c b/nanddump.c
index 54198aef92c3f5e561c9a02a13e4ab62caceb496..27b0f7a6148c1eb90b7a2fdb29331389a10dd80a 100644 (file)
--- a/nanddump.c
+++ b/nanddump.c
@@ -14,7 +14,6 @@
  */
 
 #define PROGRAM_NAME "nanddump"
-#define VERSION "1.31"
 
 #define _GNU_SOURCE
 #include <ctype.h>

diff --git a/nandwrite.c b/nandwrite.c
index 6e986c5d7741667623a5ee810da9f826797e183a..1700d612290e1f50a693ed7a79d213d49164017e 100644 (file)
--- a/nandwrite.c
+++ b/nandwrite.c
@@ -20,7 +20,6 @@
  */
 
 #define PROGRAM_NAME "nandwrite"
-#define VERSION "$Revision: 1.32 $"
 
 #define _GNU_SOURCE
 #include <ctype.h>