remove compile-time dependency on githash changes

berthubert · Feb 11, 2020 · 572e8ef · 572e8ef
1 parent d533553
commit 572e8ef
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 10 deletions.
diff --git a/galmonmon.cc b/galmonmon.cc
@@ -6,7 +6,7 @@
 #include "fmt/printf.h"
 #include "ext/powerblog/h2o-pp.hh"
 #include <variant>
-#include "githash.h"
+
 #include "CLI/CLI.hpp"
 #include "version.hh"
 

diff --git a/navcat.cc b/navcat.cc
@@ -16,7 +16,7 @@
 #include <dirent.h>
 #include <inttypes.h>
 #include "navmon.hh"
-#include "githash.h"
+
 #include "CLI/CLI.hpp"
 #include "version.hh"
 

diff --git a/navdisplay.cc b/navdisplay.cc
@@ -13,7 +13,7 @@
 #include "navmon.pb.h"
 #include <unistd.h>
 #include "navmon.hh" 
-#include "githash.h"
+
 #include "CLI/CLI.hpp"
 #include "version.hh"
 

diff --git a/navdump.cc b/navdump.cc
@@ -26,7 +26,7 @@
 #include "sp3.hh"
 #include "ubx.hh"
 #include <unistd.h>
-#include "githash.h"
+
 #include "version.hh"
 #include "gpscnav.hh"
 #include "rinex.hh"

diff --git a/navmon.hh b/navmon.hh
@@ -6,6 +6,9 @@
 #include <tuple>
 #include <mutex>
 
+extern const char* g_gitHash;
+
+
 struct EofException{};
 struct TimeoutError{};
 

diff --git a/navnexus.cc b/navnexus.cc
@@ -15,7 +15,7 @@
 #include "storage.hh"
 #include <dirent.h>
 #include <inttypes.h>
-#include "githash.h"
+
 #include "CLI/CLI.hpp"
 #include "version.hh"
 

diff --git a/navparse.cc b/navparse.cc
@@ -30,7 +30,7 @@
 #include "navparse.hh"
 #include <fenv.h> 
 #include "influxpush.hh"
-#include "githash.h"
+
 #include "CLI/CLI.hpp"
 #include "gpscnav.hh"
 #include "version.hh"

diff --git a/navrecv.cc b/navrecv.cc
@@ -11,7 +11,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "githash.h"
+
 #include "CLI/CLI.hpp"
 #include "version.hh"
 

diff --git a/reporter.cc b/reporter.cc
@@ -4,7 +4,7 @@
 #include "navmon.hh"
 #include "fmt/format.h"
 #include "fmt/printf.h"
-#include "githash.h"
+
 #include "CLI/CLI.hpp"
 #include "version.hh"
 

diff --git a/tlecatch.cc b/tlecatch.cc
@@ -1,7 +1,7 @@
 #include "SGP4.h"
 #include <string>
 #include <time.h>
-#include "githash.h"
+
 #include "CLI/CLI.hpp"
 #include "version.hh"
 

diff --git a/ubxtool.cc b/ubxtool.cc
@@ -33,7 +33,7 @@
 #include "comboaddress.hh"
 #include "swrappers.hh"
 #include "sclasses.hh"
-#include "githash.h"
+
 #include "version.hh"
 
 static char program[]="ubxtool";