Generate version.h properly...

diff --git a/include/Makefile.am b/include/Makefile.am
index e8f124fb203fabc8b6e796d3f8fd684840a16dd8..6bb3368cd374d1aef7cb9efb009f7cea90aeea7d 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -13,10 +13,6 @@ noinst_HEADERS=$(header_files)
 $(srcdir)/asoundlib.h: $(header_files)
        cat $^ > $@
 
-SOUNDLIB_MAJOR=`echo $(VERSION) | cut -d . -f 1`
-SOUNDLIB_MINOR=`echo $(VERSION) | cut -d . -f 2`
-SOUNDLIB_SUBMINOR=`echo $(VERSION) | cut -d . -f 3`
-
 version.h: stamp-vh
        @:
 
@@ -25,10 +21,10 @@ stamp-vh: $(top_builddir)/configure.in
        @echo " *  ver.tmp" >> ver.tmp
        @echo " */" >> ver.tmp
        @echo "" >> ver.tmp
-       @echo "\#define SOUNDLIB_VERSION_MAJOR          $(SOUNDLIB_MAJOR)" >> ver.tmp
-       @echo "\#define SOUNDLIB_VERSION_MINOR          $(SOUNDLIB_MINOR)" >> ver.tmp
-       @echo "\#define SOUNDLIB_VERSION_SUBMINOR       $(SOUNDLIB_SUBMINOR)" >> ver.tmp
-       @echo "\#define SOUNDLIB_VERSION                ( ( SOUNDLIB_VERSION_MAJOR << 16 ) | ( SOUNDLIB_VERSION_MINOR << 8 ) | SOUNDLIB_VERSION_SUBMINOR )" >> ver.tmp
+       @echo "\#define SND_LIB_VERSION         $(SND_LIB_VERSION)" >> ver.tmp
+       @echo "\#define SND_LIB_MAJOR           $(SND_LIB_MAJOR)" >> ver.tmp
+       @echo "\#define SND_LIB_MINOR           $(SND_LIB_MINOR)" >> ver.tmp
+       @echo "\#define SND_LIB_SUBMINOR        $(SND_LIB_SUBMINOR)" >> ver.tmp
        @cmp -s version.h ver.tmp
           || (echo "Updating version.h"; \
               cp ver.tmp version.h; \