summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThien-Thi Nguyen <ttn@gnuvola.org>2010-07-28 14:27:42 +0200
committerThien-Thi Nguyen <ttn@gnuvola.org>2010-08-18 19:48:12 +0200
commitb405cdb4c5ad31888a0a54b6fd98b466bf711a66 (patch)
tree166d60fc802cb7b2aca64e7646a3abd940d0e173
parent8996d00ee482e6d5fdea623f5fd4d32dd7da7638 (diff)
downloadguile-b405cdb4c5ad31888a0a54b6fd98b466bf711a66.tar.gz
[build] Create libguile/version.h using the configure script.
* configure.ac (AC_CONFIG_FILES): Add libguile/version.h. * libguile/Makefile.am (version.h): Delete target. (EXTRA_DIST): Remove version.h.in. (BUILT_SOURCES): Remove version.h. (MOSTLYCLEANFILES): Remove version.h, version.h.tmp. * libguile/version.h.in (SCM_MAJOR_VERSION): Use conventional @VAR@ instead of @-VAR-@ for ‘GUILE_MAJOR_VERSION’. (SCM_MINOR_VERSION, SCM_MICRO_VERSION, SCM_EFFECTIVE_VERSION): Likewise for ‘GUILE_MINOR_VERSION’, ‘GUILE_MICRO_VERSION’, ‘GUILE_EFFECTIVE_VERSION’.
-rw-r--r--configure.ac1
-rw-r--r--libguile/Makefile.am15
-rw-r--r--libguile/version.h.in8
3 files changed, 7 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index f3afec341..3569868c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1620,6 +1620,7 @@ AC_CONFIG_FILES([
emacs/Makefile
examples/Makefile
libguile/Makefile
+ libguile/version.h
srfi/Makefile
guile-readline/Makefile
test-suite/Makefile
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 3045075ec..f12c11b56 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -413,7 +413,7 @@ DOT_I_FILES = vm-i-system.i vm-i-scheme.i vm-i-loader.i
$(AM_V_GEN)$(GREP) '^VM_DEFINE' $< > $@
BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h \
- version.h scmconfig.h \
+ scmconfig.h \
$(DOT_I_FILES) $(DOT_X_FILES) $(EXTRA_DOT_X_FILES)
EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h \
@@ -595,21 +595,11 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads \
ChangeLog-1996-1999 ChangeLog-2000 ChangeLog-2008 \
guile-func-name-check \
cpp-E.syms cpp-E.c cpp-SIG.syms cpp-SIG.c \
- c-tokenize.lex version.h.in \
+ c-tokenize.lex \
scmconfig.h.top libgettext.h unidata_to_charset.pl libguile.map
# $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
# guile-procedures.txt guile.texi
-## We use @-...-@ as the substitution brackets here, instead of the
-## usual @...@, so autoconf doesn't go and substitute the values
-## directly into the left-hand sides of the sed substitutions. *sigh*
-version.h: version.h.in $(top_builddir)/config.status
- $(AM_V_GEN)sed < $(srcdir)/version.h.in > $@.tmp \
- -e s:@-GUILE_MAJOR_VERSION-@:${GUILE_MAJOR_VERSION}: \
- -e s:@-GUILE_MINOR_VERSION-@:${GUILE_MINOR_VERSION}: \
- -e s:@-GUILE_MICRO_VERSION-@:${GUILE_MICRO_VERSION}: \
- -e s:@-GUILE_EFFECTIVE_VERSION-@:${GUILE_EFFECTIVE_VERSION}: && mv $@.tmp $@
-
## FIXME: Consider using timestamp file, to avoid unnecessary rebuilds.
libpath.h: $(srcdir)/Makefile.in $(top_builddir)/config.status
@rm -f libpath.tmp
@@ -758,7 +748,6 @@ chknew-E chknew-SIG:
MOSTLYCLEANFILES = \
- version.h version.h.tmp \
scmconfig.h scmconfig.h.tmp
CLEANFILES = libpath.h *.x *.doc guile-procedures.txt guile-procedures.texi guile.texi \
diff --git a/libguile/version.h.in b/libguile/version.h.in
index 49d26c245..427afaede 100644
--- a/libguile/version.h.in
+++ b/libguile/version.h.in
@@ -27,10 +27,10 @@
-#define SCM_MAJOR_VERSION @-GUILE_MAJOR_VERSION-@
-#define SCM_MINOR_VERSION @-GUILE_MINOR_VERSION-@
-#define SCM_MICRO_VERSION @-GUILE_MICRO_VERSION-@
-#define SCM_EFFECTIVE_VERSION "@-GUILE_EFFECTIVE_VERSION-@"
+#define SCM_MAJOR_VERSION @GUILE_MAJOR_VERSION@
+#define SCM_MINOR_VERSION @GUILE_MINOR_VERSION@
+#define SCM_MICRO_VERSION @GUILE_MICRO_VERSION@
+#define SCM_EFFECTIVE_VERSION "@GUILE_EFFECTIVE_VERSION@"
SCM_API SCM scm_major_version (void);
SCM_API SCM scm_minor_version (void);