From: Kyle Fuller <redacted>
Date: Fri, 15 Jun 2018 21:55:08 +0000 (+0100)
Subject: refactor: Simplify building by moving VERSION to source
X-Git-Tag: 1.1.2~7^2~2
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=425b18c5f826db99f0b230d1f693691d09eb8824;p=znc-palaver.git

refactor: Simplify building by moving VERSION to source
---

diff --git a/Makefile b/Makefile
index e039422..e37d4a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,6 @@
-PALAVER_VERSION := $(shell git describe --tags --always --dirty 2> /dev/null || cat VERSION)
-CXXFLAGS := -Wno-unknown-pragmas -DPALAVER_VERSION=\"$(PALAVER_VERSION)\"
-
 palaver.so: test palaver.cpp
 	@echo "Building palaver.so"
-	@CXXFLAGS="$(CXXFLAGS)" znc-buildmod palaver.cpp
+	@znc-buildmod palaver.cpp
 
 install: palaver.so
 	@echo "Installing palaver.so to $(HOME)/.znc/modules/palaver.so"
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 524cb55..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.1.1
diff --git a/palaver.cpp b/palaver.cpp
index 0eb001b..8bd5a03 100644
--- a/palaver.cpp
+++ b/palaver.cpp
@@ -7,10 +7,7 @@
 
 #define REQUIRESSL
 
-#ifndef PALAVER_VERSION
-	#error "Please follow the installation instructions in the README."
-#endif
-
+#define PALAVER_VERSION "1.1.1"
 
 #include <znc/Modules.h>
 #include <znc/User.h>