open-vm-tools: move guestlibV3.x to libguestlib directory.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/guestRpc/Makefile.am b/open-vm-tools/lib/guestRpc/Makefile.am
index 2531bd052a34fd9979cd73159336fa779e6e29b4..b04f76d6a80a3d4aaefa33b2085152324f7261cc 100644 (file)
--- a/open-vm-tools/lib/guestRpc/Makefile.am
+++ b/open-vm-tools/lib/guestRpc/Makefile.am
@@ -18,7 +18,6 @@
 noinst_LTLIBRARIES = libGuestRpc.la
 
 libGuestRpc_la_SOURCES =
-libGuestRpc_la_SOURCES += guestlibV3_xdr.c
 libGuestRpc_la_SOURCES += nicinfo_xdr.c
 
 # XXX: Autoreconf complains about this and recommends using AM_CFLAGS instead.
@@ -27,13 +26,10 @@ libGuestRpc_la_SOURCES += nicinfo_xdr.c
 CFLAGS += -Wno-unused
 
 CLEANFILES =
-CLEANFILES += guestlibV3.h
-CLEANFILES += guestlibV3_xdr.c
 CLEANFILES += nicinfo.h
 CLEANFILES += nicinfo_xdr.c
 
 EXTRA_DIST =
-EXTRA_DIST += guestlibV3.x
 EXTRA_DIST += nicinfo.x
 
 
@@ -41,20 +37,6 @@ EXTRA_DIST += nicinfo.x
 # files if not invoked in the same directory as the source file, so we need
 # to copy the sources to the build dir before compiling them.
 
-guestlibV3.h: guestlibV3.x
-       if [ $(top_builddir) != $(top_srcdir) ]; then                           \
-          cp -f $(top_srcdir)/lib/guestRpc/guestlibV3.x $(builddir);           \
-       fi
-       $(RPCGEN) $(RPCGENFLAGS) -h -o $@ $(builddir)/guestlibV3.x
-       $(SED) 's,rpc/rpc\.h,vmxrpc.h,' $@ > $@.tmp
-       mv $@.tmp $@
-       $(MKDIR_P) $(top_builddir)/lib/include/guestrpc
-       cp $@ $(top_builddir)/lib/include/guestrpc
-
-guestlibV3_xdr.c: guestlibV3.x guestlibV3.h
-       $(RPCGEN) $(RPCGENFLAGS) -c -o $@ $(builddir)/guestlibV3.x
-
-
 nicinfo.h: nicinfo.x
        if [ $(top_builddir) != $(top_srcdir) ]; then               \
           cp -f $(top_srcdir)/lib/guestRpc/nicinfo.x $(builddir);  \

diff --git a/open-vm-tools/libguestlib/Makefile.am b/open-vm-tools/libguestlib/Makefile.am
index 642c953b7f21cca138201819d57db03c0f00441a..454314814ff6797dda0f5eb0c0dc0f59bd3b9c09 100644 (file)
--- a/open-vm-tools/libguestlib/Makefile.am
+++ b/open-vm-tools/libguestlib/Makefile.am
@@ -24,6 +24,7 @@ libguestlib_la_LIBADD =
 libguestlib_la_LIBADD += @VMTOOLS_LIBS@
 
 libguestlib_la_SOURCES =
+libguestlib_la_SOURCES += guestlibV3_xdr.c
 libguestlib_la_SOURCES += vmGuestLib.c
 
 libguestlib_la_LDFLAGS =
@@ -39,6 +40,12 @@ libguestlib_include_HEADERS += $(top_srcdir)/lib/include/vmGuestLib.h
 libguestlib_include_HEADERS += $(top_srcdir)/lib/include/vmSessionId.h
 libguestlib_include_HEADERS += $(top_srcdir)/lib/include/vm_basic_types.h
 
+BUILT_SOURCES =
+BUILT_SOURCES += guestlibV3.h
+BUILT_SOURCES += guestlibV3_xdr.c
+
+CFLAGS += -Wno-unused
+
 EXTRA_DIST = vmguestlib.pc.in
 
 pkgconfigdir   = $(libdir)/pkgconfig
@@ -46,3 +53,16 @@ pkgconfig_DATA = vmguestlib.pc
 
 $(pkgconfig_DATA): $(top_builddir)/config.status
 
+guestlibV3.h: guestlibV3.x
+       if [ $(top_builddir) != $(top_srcdir) ]; then                           \
+          cp -f $(top_srcdir)/lib/guestRpc/guestlibV3.x $(builddir);           \
+       fi
+       $(RPCGEN) $(RPCGENFLAGS) -h -o $@ $(builddir)/guestlibV3.x
+       $(SED) 's,rpc/rpc\.h,vmxrpc.h,' $@ > $@.tmp
+       mv $@.tmp $@
+       $(MKDIR_P) $(top_builddir)/lib/include/guestrpc
+       cp $@ $(top_builddir)/lib/include/guestrpc
+
+guestlibV3_xdr.c: guestlibV3.x guestlibV3.h
+       $(RPCGEN) $(RPCGENFLAGS) -c -o $@ $(builddir)/guestlibV3.x
+

diff --git a/open-vm-tools/lib/guestRpc/guestlibV3.x b/open-vm-tools/libguestlib/guestlibV3.x
similarity index 100%
rename from open-vm-tools/lib/guestRpc/guestlibV3.x
rename to open-vm-tools/libguestlib/guestlibV3.x