From 049360816bd760d229463ed461b443b2a7d212fe Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 13 Dec 2024 07:03:08 -0500 Subject: add version info, use MYCFLAGS for user flags --- Makefile | 18 +++++++++++++++--- uxd.c | 7 ++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4eae860..0417ed8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,11 @@ -CFLAGS=-O2 -fPIC -Wall +# Makefile for uxd, by B. Watson. WTFPL. -# these only affect the 'install' target (they don't get compiled -# into the binary). +### Override these variables as needed. Don't override CFLAGS; use +# MYCFLAGS instead. +MYCFLAGS=-O2 -fPIC -Wall + +# These only affect the 'install' target (they don't get compiled +# into the binary). PREFIX=/usr MANDIR=$(PREFIX)/man MAN1DIR=$(MANDIR)/man1 @@ -12,6 +16,14 @@ INSTALL_PROGRAM=install -s -m0755 GZIP=gzip -9 GZIP_MAN=yes +# +### No user-serviceable parts below. + +VERSION=0.1.0 + +DEFINES=-DVERSION='"$(VERSION)"' +CFLAGS=$(MYCFLAGS) $(DEFINES) + .PHONY: all test man clean install all: uxd man diff --git a/uxd.c b/uxd.c index 41a390b..9aaf83e 100644 --- a/uxd.c +++ b/uxd.c @@ -41,6 +41,10 @@ fe ff, it's UTF-16 big-endian. We detect these and print a warning on stderr. */ +#ifndef VERSION +#define VERSION "(unknown version)" +#endif + /* ANSI colors */ #define BLACK 0 /* don't use (could be the background color) */ #define RED 1 @@ -72,7 +76,8 @@ int dump_column = 0; int filepos = 0; void usage(void) { - printf("Usage: %s \n", self); + printf("uxd (Utf-8 heX Dump) v"VERSION" by B. Watson. WTFPL.\n"); + printf("Usage: %s []\n", self); printf(" With no , or with -, read standard input.\n"); exit(0); } -- cgit v1.2.3