diff options
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/main.cc | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 58af85bc..e1ac4c32 100644 --- a/configure.ac +++ b/configure.ac @@ -23,9 +23,6 @@ dnl SOFTWARE. AC_INIT(colm, 0.14.3) PUBDATE="December 2020" -COLM_VERSION="0.14.3" -COLM_PUBDATE="December 2020" - AM_INIT_AUTOMAKE([foreign]) : ${CFLAGS="-Wall -g"} @@ -34,8 +31,6 @@ AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST(PUBDATE) -AC_SUBST(COLM_VERSION) -AC_SUBST(COLM_PUBDATE) AC_CHECK_SIZEOF([int]) AC_CHECK_SIZEOF([void *]) diff --git a/src/Makefile.am b/src/Makefile.am index bc43d75d..1341a41c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,7 +44,7 @@ lib_LTLIBRARIES = libcolm.la noinst_LIBRARIES = libprog.a libcolm_la_SOURCES = $(RUNTIME_SRC) -libcolm_la_LDFLAGS = -release ${COLM_VERSION} -no-undefined +libcolm_la_LDFLAGS = -release ${VERSION} -no-undefined if LINKER_NO_UNDEFINED libcolm_la_LDFLAGS += -Wl,--no-undefined @@ -196,8 +196,8 @@ include/colm: ln -s .. include/colm version.h: Makefile - echo '#define COLM_VERSION "$(COLM_VERSION)"' > version.h - echo '#define COLM_PUBDATE "$(COLM_PUBDATE)"' >> version.h + echo '#define VERSION "$(VERSION)"' > version.h + echo '#define PUBDATE "$(PUBDATE)"' >> version.h config.h: ../src/config.h cp ../src/config.h ./ diff --git a/src/main.cc b/src/main.cc index 5d6cbac4..301fae91 100644 --- a/src/main.cc +++ b/src/main.cc @@ -215,8 +215,8 @@ void usage() /* Print version information. */ void version() { - cout << "Colm version " COLM_VERSION << " " COLM_PUBDATE << endl << - "Copyright (c) 2007-2019 by Adrian D. Thurston" << endl; + cout << "Colm version " VERSION << " " PUBDATE << endl << + "Copyright (c) 2007-2020 by Dr. Adrian D. Thurston" << endl; } /* Scans a string looking for the file extension. If there is a file |