Commit Diff

Commit:
d307e5a2ebf6d0c2f26028893988df0cd2b18e8a
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
drop AMUSED_VERSION and the undocumented -V flag
Actions:
Patch | Tree
commit - 00f500ff5aac666e09c36e3bc60ef0462431ee29
commit + d307e5a2ebf6d0c2f26028893988df0cd2b18e8a
blob - 361e0d01022c4db8a4d2b1e8bd843e1cf44c073d
blob + 63d5bd4337343389bdc473f7b9901fd6bfce8529
--- Makefile
+++ Makefile
@@ -4,8 +4,7 @@ SRCS=	amused.c control.c log.c xmalloc.c player.c ctl.
 
 .include "amused-version.mk"
 
-CPPFLAGS +=	-DAMUSED_VERSION=\"${AMUSED_VERSION}\" \
-		-I/usr/local/include -I/usr/local/include/opus
+CPPFLAGS += -I/usr/local/include -I/usr/local/include/opus
 
 LDADD =	-levent -lm -lsndio -lutil \
 	-L/usr/local/lib -lmad -lvorbisfile -lopusfile -lFLAC
blob - 38130e191d1cd390708a009f7ef8135aebe9f5d2
blob + a9b3a93129e6d8632418e9f76cc92eef389cbdac
--- amused.c
+++ amused.c
@@ -299,7 +299,7 @@ main(int argc, char **argv)
 	if (argv0 == NULL)
 		argv0 = "amused";
 
-	while ((ch = getopt(argc, argv, "ds:T:vV")) != -1) {
+	while ((ch = getopt(argc, argv, "ds:T:v")) != -1) {
 		switch (ch) {
 		case 'd':
 			debug = 1;
@@ -320,10 +320,6 @@ main(int argc, char **argv)
 		case 'v':
 			verbose++;
 			break;
-		case 'V':
-			printf("%s version %s\n", getprogname(),
-			    AMUSED_VERSION);
-			exit(0);
 		default:
 			usage();
 		}
blob - 97fbef8ac465a4b8fde32b1af7f5cad81e4f2b35
blob + c146c3485fdaf4fac39eb47bb4a9373ae8fb709b
--- ctl.c
+++ ctl.c
@@ -68,7 +68,6 @@ __dead void
 usage(void)
 {
 	fprintf(stderr, "usage: %s [-dv] [-s socket]\n", getprogname());
-	fprintf(stderr, "%s version %s\n", getprogname(), AMUSED_VERSION);
 	exit(1);
 }