From a8f94d29b38872fbc6cf9a1a8223ff8453357da1 Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Mon, 9 Jul 2001 22:25:29 +0000 Subject: [PATCH] compile the version number into the isccfg and isccc libraries, like we do with all other libraries --- lib/isccc/Makefile.in | 20 ++++++++++---------- lib/isccc/version.c | 24 ++++++++++++++++++++++++ lib/isccfg/Makefile.in | 20 ++++++++++---------- lib/isccfg/version.c | 24 ++++++++++++++++++++++++ util/copyrights | 2 ++ 5 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 lib/isccc/version.c create mode 100644 lib/isccfg/version.c diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in index 642db69622..948b6bd976 100644 --- a/lib/isccc/Makefile.in +++ b/lib/isccc/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.1 2001/03/27 00:44:47 bwelling Exp $ +# $Id: Makefile.in,v 1.2 2001/07/09 22:25:26 gson Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -43,25 +43,25 @@ SUBDIRS = include # Alphabetically OBJS = alist.@O@ base64.@O@ cc.@O@ ccmsg.@O@ \ lib.@O@ \ - result.@O@ sexpr.@O@ symtab.@O@ + result.@O@ sexpr.@O@ symtab.@O@ version.@O@ # Alphabetically SRCS = alist.c base64.c cc.c ccmsg.c \ lib.c \ - result.c sexpr.c symtab.c + result.c sexpr.c symtab.c version.c TARGETS = timestamp @BIND9_MAKE_RULES@ -# version.@O@: version.c -# ${LIBTOOL} ${CC} ${ALL_CFLAGS} \ -# -DVERSION=\"${VERSION}\" \ -# -DLIBINTERFACE=${LIBINTERFACE} \ -# -DLIBREVISION=${LIBREVISION} \ -# -DLIBAGE=${LIBAGE} \ -# -c ${srcdir}/version.c +version.@O@: version.c + ${LIBTOOL} ${CC} ${ALL_CFLAGS} \ + -DVERSION=\"${VERSION}\" \ + -DLIBINTERFACE=${LIBINTERFACE} \ + -DLIBREVISION=${LIBREVISION} \ + -DLIBAGE=${LIBAGE} \ + -c ${srcdir}/version.c libisccc.@SA@: ${OBJS} ${AR} ${ARFLAGS} $@ ${OBJS} diff --git a/lib/isccc/version.c b/lib/isccc/version.c new file mode 100644 index 0000000000..b40e2d3ff0 --- /dev/null +++ b/lib/isccc/version.c @@ -0,0 +1,24 @@ +/* + * Copyright (C) 1998-2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: version.c,v 1.1 2001/07/09 22:25:27 gson Exp $ */ + +char isccc_version[] = VERSION; + +unsigned int isccc_libinterface = LIBINTERFACE; +unsigned int isccc_librevision = LIBREVISION; +unsigned int isccc_libage = LIBAGE; diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in index 377da4022e..fd858b2c41 100644 --- a/lib/isccfg/Makefile.in +++ b/lib/isccfg/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.5 2001/03/27 02:06:07 bwelling Exp $ +# $Id: Makefile.in,v 1.6 2001/07/09 22:25:27 gson Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -41,22 +41,22 @@ LIBS = @LIBS@ SUBDIRS = include # Alphabetically -OBJS = check.@O@ log.@O@ parser.@O@ +OBJS = check.@O@ log.@O@ parser.@O@ version.@O@ # Alphabetically -SRCS = check.c log.c parser.c +SRCS = check.c log.c parser.c version.c TARGETS = timestamp @BIND9_MAKE_RULES@ -# version.@O@: version.c -# ${LIBTOOL} ${CC} ${ALL_CFLAGS} \ -# -DVERSION=\"${VERSION}\" \ -# -DLIBINTERFACE=${LIBINTERFACE} \ -# -DLIBREVISION=${LIBREVISION} \ -# -DLIBAGE=${LIBAGE} \ -# -c ${srcdir}/version.c +version.@O@: version.c + ${LIBTOOL} ${CC} ${ALL_CFLAGS} \ + -DVERSION=\"${VERSION}\" \ + -DLIBINTERFACE=${LIBINTERFACE} \ + -DLIBREVISION=${LIBREVISION} \ + -DLIBAGE=${LIBAGE} \ + -c ${srcdir}/version.c libisccfg.@SA@: ${OBJS} ${AR} ${ARFLAGS} $@ ${OBJS} diff --git a/lib/isccfg/version.c b/lib/isccfg/version.c new file mode 100644 index 0000000000..d3a76a1e42 --- /dev/null +++ b/lib/isccfg/version.c @@ -0,0 +1,24 @@ +/* + * Copyright (C) 1998-2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: version.c,v 1.1 2001/07/09 22:25:28 gson Exp $ */ + +char cfg_version[] = VERSION; + +unsigned int cfg_libinterface = LIBINTERFACE; +unsigned int cfg_librevision = LIBREVISION; +unsigned int cfg_libage = LIBAGE; diff --git a/util/copyrights b/util/copyrights index a86e863ee5..35e70fa99d 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1667,6 +1667,7 @@ ./lib/isccc/result.c C.NOM 2001 ./lib/isccc/sexpr.c C.NOM 2001 ./lib/isccc/symtab.c C.NOM 2001 +./lib/isccc/version.c C 1998,1999,2000,2001 ./lib/isccfg/.cvsignore X 2001 ./lib/isccfg/Makefile.in MAKE 2001 ./lib/isccfg/api X 2001 @@ -1680,6 +1681,7 @@ ./lib/isccfg/include/isccfg/log.h C 2001 ./lib/isccfg/log.c C 2001 ./lib/isccfg/parser.c C 2000,2001 +./lib/isccfg/version.c C 1998,1999,2000,2001 ./lib/lwres/.cvsignore X 2000,2001 ./lib/lwres/Makefile.in MAKE 2000,2001 ./lib/lwres/api X 2000,2001