We only need one vtag

5 files changed, 2 insertions, 40 deletions

diff --git a/fnet/src/vespa/fnet/CMakeLists.txt b/fnet/src/vespa/fnet/CMakeLists.txt
index 2df853b2893..556cb69a988 100644
--- a/fnet/src/vespa/fnet/CMakeLists.txt
+++ b/fnet/src/vespa/fnet/CMakeLists.txt
@@ -22,7 +22,6 @@ vespa_add_library(fnet
     task.cpp
     transport.cpp
     transport_thread.cpp
-    vtag.cpp
     $<TARGET_OBJECTS:fnet_frt>
     INSTALL lib64
     DEPENDS
diff --git a/fnet/src/vespa/fnet/fnet.h b/fnet/src/vespa/fnet/fnet.h
index b4ca0d95599..85f4f3e750e 100644
--- a/fnet/src/vespa/fnet/fnet.h
+++ b/fnet/src/vespa/fnet/fnet.h
@@ -3,15 +3,12 @@
 #pragma once
 
 #include <vespa/fastos/fastos.h>
+#include <vespa/vespalib/component/vtag.h>
 
 // FEATURES
 
 #include "features.h"
 
-// VTAG
-
-#include "vtag.h"
-
 // DEFINES
 
 #define FNET_NOID ((uint32_t)-1)
diff --git a/fnet/src/vespa/fnet/info.cpp b/fnet/src/vespa/fnet/info.cpp
index c345fc2e28c..1ad3dbb784a 100644
--- a/fnet/src/vespa/fnet/info.cpp
+++ b/fnet/src/vespa/fnet/info.cpp
@@ -61,7 +61,7 @@ FNET_Info::FNET_Info()
 const char*
 FNET_Info::GetFNETVersion()
 {
-    return fnet::VersionTag;
+    return vespalib::VersionTag;
 }
 
 
diff --git a/fnet/src/vespa/fnet/vtag.cpp b/fnet/src/vespa/fnet/vtag.cpp
deleted file mode 100644
index e2f280dee5b..00000000000
--- a/fnet/src/vespa/fnet/vtag.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/fnet/fnet.h>
-
-#ifndef V_TAG
-#define V_TAG "NOTAG"
-#define V_TAG_DATE "NOTAG"
-#define V_TAG_SYSTEM "NOTAG"
-#define V_TAG_SYSTEM_REV "NOTAG"
-#define V_TAG_BUILDER "NOTAG"
-#endif
-
-namespace fnet {
-
-char VersionTag[] = V_TAG;
-char VersionTagDate[] = V_TAG_DATE;
-char VersionTagSystem[] = V_TAG_SYSTEM;
-char VersionTagSystemRev[] = V_TAG_SYSTEM_REV;
-char VersionTagBuilder[] = V_TAG_BUILDER;
-
-} // namespace fnet
diff --git a/fnet/src/vespa/fnet/vtag.h b/fnet/src/vespa/fnet/vtag.h
deleted file mode 100644
index 28b3164e9fc..00000000000
--- a/fnet/src/vespa/fnet/vtag.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-namespace fnet {
-
-extern char VersionTag[];
-extern char VersionTagDate[];
-extern char VersionTagSystem[];
-extern char VersionTagSystemRev[];
-extern char VersionTagBuilder[];
-
-} // namespace fnet
-