Clean up vm_version.h includes

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/checkvm/checkvm.c b/open-vm-tools/checkvm/checkvm.c
index d5d5984a685ee458c2a06f0697aff727db951feb..e4bd98578f355987d40630f2e38d0a0e4e296379 100644 (file)
--- a/open-vm-tools/checkvm/checkvm.c
+++ b/open-vm-tools/checkvm/checkvm.c
@@ -39,6 +39,7 @@
 #endif
 
 #include "checkvm_version.h"
+#include "vm_version.h"
 #include "embed_version.h"
 VM_EMBED_VERSION(CHECKVM_VERSION_STRING);
 

diff --git a/open-vm-tools/hgfsclient/hgfsclient.c b/open-vm-tools/hgfsclient/hgfsclient.c
index 40387654e380357e88e09dce712b27a4085ebd50..6b221f551a9de3bec38acfe20fa52923cc92f100 100644 (file)
--- a/open-vm-tools/hgfsclient/hgfsclient.c
+++ b/open-vm-tools/hgfsclient/hgfsclient.c
@@ -39,6 +39,7 @@
 #include "vmware/tools/utils.h"
 
 #include "hgfsclient_version.h"
+#include "vm_version.h"
 #include "embed_version.h"
 VM_EMBED_VERSION(HGFSCLIENT_VERSION_STRING);
 

diff --git a/open-vm-tools/hgfsmounter/hgfsmounter.c b/open-vm-tools/hgfsmounter/hgfsmounter.c
index 27aa20fb41223184d349db4c275f6d0d3b8a58cb..296aa6f86bd6d888d1da97867e0e4d278b5659b2 100644 (file)
--- a/open-vm-tools/hgfsmounter/hgfsmounter.c
+++ b/open-vm-tools/hgfsmounter/hgfsmounter.c
@@ -98,10 +98,12 @@
 #include "vm_assert.h"
 #include "str.h"
 #include "strutil.h"
+#include "vm_version.h"
 #include "hgfsmounter_version.h"
 
 /* XXX embed_version.h does not currently support Mach-O binaries (OS X). */
 #if defined(linux) || defined(__FreeBSD__)
+#  include "vm_version.h"
 #  include "embed_version.h"
    VM_EMBED_VERSION(HGFSMOUNTER_VERSION_STRING);
 #endif

diff --git a/open-vm-tools/lib/include/embed_version.h b/open-vm-tools/lib/include/embed_version.h
index c127a6667f3818c065e3828681b13422224e9925..c8972dcac0ce9303912abedfd2ddd6858b4f768e 100644 (file)
--- a/open-vm-tools/lib/include/embed_version.h
+++ b/open-vm-tools/lib/include/embed_version.h
@@ -40,8 +40,6 @@
  */
 #if !defined(_WIN32) && !defined(__APPLE__)
 
-#include "vm_version.h"
-
 #define VM_EMBED_VERSION(ver)                                    \
 const char vm_version[]                                          \
    __attribute__((section(".modinfo"), unused)) = "version=" ver

diff --git a/open-vm-tools/lib/include/vm_legal.h b/open-vm-tools/lib/include/vm_legal.h
index 310c59117444fbdf3f7960227923e7b0abdac623..1d6f827937df5d098584e670fb043856cdfe97ab 100644 (file)
--- a/open-vm-tools/lib/include/vm_legal.h
+++ b/open-vm-tools/lib/include/vm_legal.h
@@ -24,10 +24,7 @@
 #ifndef VM_LEGAL_H
 #define VM_LEGAL_H
 
-/*
- * COMPANY_NAME comes from vm_version.h
- */
-#include "vm_version.h"
+#include "vm_product.h"
 
 #ifndef WSTR
 #define WSTR_(x) L ## x

diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index 1d97e48f26a629c883852f0fe4f7900ae8564d76..3826d6cd0c89dabc11af05a410cb104525bb99a4 100644 (file)
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -30,7 +30,6 @@
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
 
-#include "buildNumber.h"
 #include "vm_basic_types.h"
 #endif /* RC_INVOKED */
 

diff --git a/open-vm-tools/libhgfs/hgfslib.c b/open-vm-tools/libhgfs/hgfslib.c
index e4f494d7e0cad7a598c152f4fc82cfde2938fdaa..c0bf24addbd7cc1769780007062d8dda2c5f4d9d 100644 (file)
--- a/open-vm-tools/libhgfs/hgfslib.c
+++ b/open-vm-tools/libhgfs/hgfslib.c
@@ -22,6 +22,7 @@
  * Library entry point.
  */
 
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolslib_version.h"
 VM_EMBED_VERSION(VMTOOLSLIB_VERSION_STRING);

diff --git a/open-vm-tools/libvmtools/vmtools.c b/open-vm-tools/libvmtools/vmtools.c
index d3307df500ea88893d576dcfd9d6d339ae1c08b6..741e9857dd472caf58ffedabc60e0903945a25f6 100644 (file)
--- a/open-vm-tools/libvmtools/vmtools.c
+++ b/open-vm-tools/libvmtools/vmtools.c
@@ -39,6 +39,7 @@
 #include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolslib_version.h"
 VM_EMBED_VERSION(VMTOOLSLIB_VERSION_STRING);

diff --git a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
index 68b6e052d8bb468680fa24d7425d30d1b54fc9ed..7d2c1165928359ddef959821e07e8f2b22065938 100644 (file)
--- a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
+++ b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
@@ -61,6 +61,7 @@
 #include "vmware/tools/vmbackup.h"
 
 #if !defined(__APPLE__)
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolsd_version.h"
 VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);

diff --git a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
index 6d2b9eed7c4d5e72471d6bd5b47c985da105c0ac..52ce5aeb6386030621f56cce53e2c54ec1ef08c1 100644 (file)
--- a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
+++ b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
@@ -36,6 +36,7 @@
 
 
 #if !defined(__APPLE__)
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolsd_version.h"
 VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);

diff --git a/open-vm-tools/services/plugins/powerOps/powerOps.c b/open-vm-tools/services/plugins/powerOps/powerOps.c
index 15d73dbe3b2abb252d727c055e92bd035cc54d03..d2ea154dec73b27b63ee21a83e94d584523ac74c 100644 (file)
--- a/open-vm-tools/services/plugins/powerOps/powerOps.c
+++ b/open-vm-tools/services/plugins/powerOps/powerOps.c
@@ -41,6 +41,7 @@
 #endif
 
 #if !defined(__APPLE__)
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolsd_version.h"
 VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);

diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c b/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
index 5f11ea674885c009c4264df96026aadf70b2c814..8c43fcdfbade4e9b72ef2b61fe3d74cb78d72a93 100644 (file)
--- a/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
+++ b/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
@@ -40,6 +40,7 @@
 #include "vmware/tools/utils.h"
 
 
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolsd_version.h"
 VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);

diff --git a/open-vm-tools/services/plugins/timeSync/timeSync.c b/open-vm-tools/services/plugins/timeSync/timeSync.c
index e9ecd3925cf41bd538cb5cf10bd603b2a9909665..1184a0454b316839cfbc149f4b3983ebc8f528d6 100644 (file)
--- a/open-vm-tools/services/plugins/timeSync/timeSync.c
+++ b/open-vm-tools/services/plugins/timeSync/timeSync.c
@@ -97,6 +97,7 @@
 #include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolsd_version.h"
 VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);

diff --git a/open-vm-tools/services/plugins/vix/vixPlugin.c b/open-vm-tools/services/plugins/vix/vixPlugin.c
index 20ed570a2a393023c07b8d98d5e7b45b5511024b..e2dd38ca7e2ba43b12d02acab8ed28b16b44c835 100644 (file)
--- a/open-vm-tools/services/plugins/vix/vixPlugin.c
+++ b/open-vm-tools/services/plugins/vix/vixPlugin.c
@@ -33,6 +33,7 @@
 #include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolsd_version.h"
 VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);

diff --git a/open-vm-tools/services/plugins/vmbackup/stateMachine.c b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
index c8b8e6c7c96e69c2c6f12fe076a47a22e249fce8..4b3cc54f1531dfc74fdf6aa3491ea30eb517a561 100644 (file)
--- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
+++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
@@ -51,6 +51,7 @@
 #include "xdrutil.h"
 
 #if !defined(__APPLE__)
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolsd_version.h"
 VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);

diff --git a/open-vm-tools/services/vmtoolsd/cmdLine.c b/open-vm-tools/services/vmtoolsd/cmdLine.c
index 98774492d3cd6d560b366555ebacb4dbf72d3b2a..2278eda95cbbcdd8d6af7d885429f578c399b8bf 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/cmdLine.c
+++ b/open-vm-tools/services/vmtoolsd/cmdLine.c
@@ -42,7 +42,7 @@
 #include "vmware/tools/log.h"
 #include "vmware/tools/utils.h"
 #include "vmware/tools/i18n.h"
-
+#include "vm_version.h"
 
 /**
  * Runs the given Tools RPC command, printing the result to the terminal and

diff --git a/open-vm-tools/services/vmtoolsd/mainLoop.c b/open-vm-tools/services/vmtoolsd/mainLoop.c
index 67a23d6afa5239fdae82549821a1e9a0dd488d26..b063866744ea2a842d46f664fbbe40dafbd4f108 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/mainLoop.c
+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
@@ -37,6 +37,7 @@
 #include "util.h"
 #include "vmcheck.h"
 #include "vm_tools_version.h"
+#include "vm_version.h"
 #include "vmware/guestrpc/tclodefs.h"
 #include "vmware/tools/log.h"
 #include "vmware/tools/utils.h"

diff --git a/open-vm-tools/services/vmtoolsd/mainPosix.c b/open-vm-tools/services/vmtoolsd/mainPosix.c
index c4c04ccbf9cf43724522c3b03ef979792d82ca3d..c47e091c3d1a1eebc2bdcc91b22a05dd7284ecc5 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/mainPosix.c
+++ b/open-vm-tools/services/vmtoolsd/mainPosix.c
@@ -40,6 +40,7 @@
 #include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolsd_version.h"
 VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);

diff --git a/open-vm-tools/services/vmtoolsd/toolsRpc.c b/open-vm-tools/services/vmtoolsd/toolsRpc.c
index cde14d44864590768902f9948308dd92dd01eb48..e8a0bdc69945fa6702c9b45a500ac0d390e6873b 100644 (file)
--- a/open-vm-tools/services/vmtoolsd/toolsRpc.c
+++ b/open-vm-tools/services/vmtoolsd/toolsRpc.c
@@ -34,7 +34,7 @@
 #include "toolsCoreInt.h"
 #include "vm_tools_version.h"
 #include "vmware/tools/utils.h"
-
+#include "vm_version.h"
 
 /**
  * Take action after an RPC channel reset.

diff --git a/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c b/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c
index 84e241a0372be58bfa03747a8a4bc0ddf2725eaa..579f148eb8f1ba60336a24e930a541ec4e2e07f7 100644 (file)
--- a/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c
+++ b/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c
@@ -31,6 +31,7 @@
 #include "util.h"
 #include "vmrpcdbgInt.h"
 
+#include "vm_version.h"
 #include "embed_version.h"
 #include "vmtoolsd_version.h"
 VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);

diff --git a/open-vm-tools/toolbox/toolbox-cmd.c b/open-vm-tools/toolbox/toolbox-cmd.c
index 8d212a048d7199ab59b816a7ee4be7bd4315cb0a..5844cf661cc224b0ed63b11370987a463a78aeea 100644 (file)
--- a/open-vm-tools/toolbox/toolbox-cmd.c
+++ b/open-vm-tools/toolbox/toolbox-cmd.c
@@ -38,7 +38,10 @@
 #include "vmware/tools/i18n.h"
 #include "vmware/tools/log.h"
 #include "vmware/tools/utils.h"
+#include "vm_version.h"
+#include "vm_product_versions.h"
 
+#include "vm_version.h"
 #include "embed_version.h"
 VM_EMBED_VERSION(TOOLBOXCMD_VERSION_STRING);
 

diff --git a/open-vm-tools/vmblockmounter/vmblockmounter.c b/open-vm-tools/vmblockmounter/vmblockmounter.c
index 8c5c15c141d3f477481b87bb3a33383d2016c397..6b2fab6494346fd9449ff90515b8f2daded9c1aa 100644 (file)
--- a/open-vm-tools/vmblockmounter/vmblockmounter.c
+++ b/open-vm-tools/vmblockmounter/vmblockmounter.c
@@ -46,6 +46,7 @@
 #include "vmblock.h"
 #include "vmblockmounter_version.h"
 
+#include "vm_version.h"
 #include "embed_version.h"
 VM_EMBED_VERSION(VMBLOCKMOUNTER_VERSION_STRING);
 

diff --git a/open-vm-tools/vmware-user-suid-wrapper/main.c b/open-vm-tools/vmware-user-suid-wrapper/main.c
index eb7873d2be66746ecb63395afa246e0108e623ad..fa9104ee1134fa1540e2fbcbca87d0eb1f0f2dc0 100644 (file)
--- a/open-vm-tools/vmware-user-suid-wrapper/main.c
+++ b/open-vm-tools/vmware-user-suid-wrapper/main.c
@@ -49,6 +49,7 @@
 #include "wrapper.h"
 
 #include "wrapper_version.h"
+#include "vm_version.h"
 #include "embed_version.h"
 VM_EMBED_VERSION(WRAPPER_VERSION_STRING);
 

diff --git a/open-vm-tools/xferlogs/xferlogs.c b/open-vm-tools/xferlogs/xferlogs.c
index c15be20f1325563dfdcae9f066021d60ca487027..2a697d16d80eb30f9a66e40d1f553ce68d93e849 100644 (file)
--- a/open-vm-tools/xferlogs/xferlogs.c
+++ b/open-vm-tools/xferlogs/xferlogs.c
@@ -55,6 +55,7 @@
 #include "strutil.h"
 
 #include "xferlogs_version.h"
+#include "vm_version.h"
 #include "embed_version.h"
 VM_EMBED_VERSION(XFERLOGS_VERSION_STRING);