From fb2101129d6fccd0876a77056fd9759fbf7f5a89 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Mon, 23 Nov 1998 22:11:34 +0000 Subject: [PATCH] Fix rules for version.h --- include/Makefile.am | 24 ++++++++++++++++++++---- include/version.h.in | 11 ----------- 2 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 include/version.h.in diff --git a/include/Makefile.am b/include/Makefile.am index d3a8f59f..a8ebf6ac 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,5 +1,3 @@ - - sysincludedir = ${includedir}/sys sysinclude_HEADERS = asoundlib.h @@ -10,8 +8,26 @@ header_files=header.h version.h error.h control.h mixer.h pcm.h rawmidi.h \ noinst_HEADERS=$(header_files) -$(srcdir)/asoundlib.h: $(header_files) +asoundlib.h: $(header_files) cat $^ > $@ -INCLUDES=-I$(top_srcdir)/include +version.h: stamp-vh + @: +stamp-vh: $(top_builddir)/configure.in + @echo "/*" > ver.tmp + @echo " * ver.tmp" >> ver.tmp + @echo " */" >> ver.tmp + @echo "" >> 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 + @echo >> ver.tmp + @cmp -s version.h ver.tmp \ + || (echo "Updating version.h"; \ + cp ver.tmp version.h; \ + echo timestamp > stamp-vh) + -@rm -f ver.tmp + +INCLUDES=-I$(top_srcdir)/include diff --git a/include/version.h.in b/include/version.h.in deleted file mode 100644 index caba88b3..00000000 --- a/include/version.h.in +++ /dev/null @@ -1,11 +0,0 @@ -/* - * version.h - */ - -#define SOUNDLIB_VERSION_MAJOR @SND_LIB_MAJOR@ -#define SOUNDLIB_VERSION_MINOR @SND_LIB_MINOR@ -#define SOUNDLIB_VERSION_SUBMINOR @SND_LIB_SUBMINOR@ -#define SOUNDLIB_VERSION ((SOUNDLIB_VERSION_MAJOR << 16) | \ - (SOUNDLIB_VERSION_MINOR << 8) | \ - SOUNDLIB_VERSION_SUBMINOR) - -- 2.47.1