refactor: Simplify building by moving VERSION to source

diff --git a/Makefile b/Makefile
index e039422134535ea23a78fe91a209cc4b178c0f5e..e37d4a65700d2b64a66198ef1904b8158d9dd4d1 100644 (file)
--- 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 (file)
index 524cb55..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.1.1

diff --git a/palaver.cpp b/palaver.cpp
index 0eb001bfbd800bd50fbbc1a87505f66f5b2116ea..8bd5a0394ae0f7ba9f4030b68bdef83dc51a85f1 100644 (file)
--- 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>