From 20b866cd3bb11a8d26099fbc081b50e22e24c4e7 Mon Sep 17 00:00:00 2001 From: Adrian Thurston Date: Wed, 23 Dec 2020 08:41:21 -0800 Subject: removed duplicate version COLM_VERSION This was left over from the time colm and ragel were in one repos. Now just use VERSION and PUBDATE. --- src/Makefile.am | 6 +++--- src/main.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') 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 -- cgit v1.2.1