mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-09 05:30:21 +02:00
[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’.
This commit is contained in:
parent
8996d00ee4
commit
b405cdb4c5
3 changed files with 7 additions and 17 deletions
|
@ -1620,6 +1620,7 @@ AC_CONFIG_FILES([
|
|||
emacs/Makefile
|
||||
examples/Makefile
|
||||
libguile/Makefile
|
||||
libguile/version.h
|
||||
srfi/Makefile
|
||||
guile-readline/Makefile
|
||||
test-suite/Makefile
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue