Move deployPkgFormat.h to lib/include/deployPkg.

diff --git a/open-vm-tools/libDeployPkg/deployPkgFormat.h b/open-vm-tools/lib/include/deployPkg/deployPkgFormat.h
similarity index 100%
rename from open-vm-tools/libDeployPkg/deployPkgFormat.h
rename to open-vm-tools/lib/include/deployPkg/deployPkgFormat.h

diff --git a/open-vm-tools/libDeployPkg/Makefile.am b/open-vm-tools/libDeployPkg/Makefile.am
index 0c1415ec95b14236f62047de81d0ddabea59326d..754cb8396e1e0a2f1ca4ce35065c566c1226ecb8 100644 (file)
--- a/open-vm-tools/libDeployPkg/Makefile.am
+++ b/open-vm-tools/libDeployPkg/Makefile.am
@@ -28,7 +28,6 @@ libDeployPkg_la_LIBADD += @MSPACK_LIBS@
 libDeployPkg_la_LIBADD += @VMTOOLS_LIBS@
 
 libDeployPkg_la_SOURCES =
-libDeployPkg_la_SOURCES += deployPkgFormat.h
 libDeployPkg_la_SOURCES += linuxDeployment.c
 libDeployPkg_la_SOURCES += mspackConfig.h
 libDeployPkg_la_SOURCES += mspackWrapper.c
@@ -51,6 +50,7 @@ libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-common/log.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-common/process.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vm_basic_types.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/tools/guestrpc.h
+libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/deployPkg/deployPkgFormat.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/deployPkg/linuxDeployment.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/guestrpc/deploypkg.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/guestrpc/guestcust-events.h

diff --git a/open-vm-tools/libDeployPkg/linuxDeployment.c b/open-vm-tools/libDeployPkg/linuxDeployment.c
index e805990202c1f761d40f6a6fac1292a283a2fd25..2a9799bc8248f4f67372636e14205f26401cbca5 100644 (file)
--- a/open-vm-tools/libDeployPkg/linuxDeployment.c
+++ b/open-vm-tools/libDeployPkg/linuxDeployment.c
@@ -39,7 +39,7 @@
 #include "str.h"
 
 #include "mspackWrapper.h"
-#include "deployPkgFormat.h"
+#include "deployPkg/deployPkgFormat.h"
 #include "deployPkg/linuxDeployment.h"
 #include "imgcust-common/process.h"
 #include "linuxDeploymentUtilities.h"