RPC: include libnfs-zdr.h from all raw libnfs-raw-*.h files

Include the zdr header from all raw lowlevel headers so that we don't have to
include it manually from apps.

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>

diff --git a/mount/Makefile.am b/mount/Makefile.am
index 6daa8081e20d7f330c992868415eb11559ff7072..5a9c65e2a19c9d2dcc4f671b687c91db7cabb2c6 100644 (file)
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -19,6 +19,6 @@ mount-stamp : mount.x
 
 compile_rpc:
        cat mount.x | head -29 >libnfs-raw-mount.h
-       rpcgen -h mount.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-mount.h
+       rpcgen -h mount.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-mount.h
        cat mount.x | head -29 >libnfs-raw-mount.c
        rpcgen -c mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n      buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-mount.c

diff --git a/mount/libnfs-raw-mount.h b/mount/libnfs-raw-mount.h
index 06fdcae577849aff9be641a05c5e47cf99a1dc87..23ca6ba85190314030a6771d445a2b992c185820 100644 (file)
--- a/mount/libnfs-raw-mount.h
+++ b/mount/libnfs-raw-mount.h
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #ifndef _MOUNT_H_RPCGEN
 #define _MOUNT_H_RPCGEN
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus

diff --git a/nfs/Makefile.am b/nfs/Makefile.am
index 5faee61121d59ea4ef0974c16acc9452f6882b87..c15537299f7a0397b2b5d5a82f4293cc0f175107 100644 (file)
--- a/nfs/Makefile.am
+++ b/nfs/Makefile.am
@@ -19,6 +19,6 @@ nfs-stamp : nfs.x
 
 compile_rpc:   
        cat nfs.x | head -29 >libnfs-raw-nfs.h
-       rpcgen -h nfs.x | sed -e "s/#include <rpc\/rpc.h>//" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include <nfsc\/libnfs-zdr.h>/g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n#if defined(ANDROID)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif\n#if defined(WIN32)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs.h
+       rpcgen -h nfs.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include <nfsc\/libnfs-zdr.h>/g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n#if defined(ANDROID)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif\n#if defined(WIN32)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs.h
        cat nfs.x | head -29 >libnfs-raw-nfs.c
        rpcgen -c nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs.c

diff --git a/nfs/libnfs-raw-nfs.h b/nfs/libnfs-raw-nfs.h
index 8837d3dcf946b36cdf4542ea78bb5afdaa0c886a..835029e7ff4c88f1d8770586514d2339a37c437f 100644 (file)
--- a/nfs/libnfs-raw-nfs.h
+++ b/nfs/libnfs-raw-nfs.h
@@ -36,7 +36,7 @@ either expressed or implied, of the FreeBSD Project.
 #define _NFS_H_RPCGEN
 #include <nfsc/libnfs-zdr.h>
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus

diff --git a/nlm/Makefile.am b/nlm/Makefile.am
index 3ed74b755fc33a616174bd59e2be737236a5aa8c..dd91cb97f707837e6f1724cdf1e9f546c2d97504 100644 (file)
--- a/nlm/Makefile.am
+++ b/nlm/Makefile.am
@@ -19,6 +19,6 @@ nlm-stamp : nlm.x
 
 compile_rpc:   
        cat nlm.x | head -29 >libnfs-raw-nlm.h
-       rpcgen -h nlm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nlm.h
+       rpcgen -h nlm.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nlm.h
        cat nlm.x | head -29 >libnfs-raw-nlm.c
        rpcgen -c nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nlm.c

diff --git a/nlm/libnfs-raw-nlm.h b/nlm/libnfs-raw-nlm.h
index 15374e7b1cbaad5ff841ce92a80025f3366cf784..ce852598ef3bedf96a021c2f8d6ff6e3d95c2aaf 100644 (file)
--- a/nlm/libnfs-raw-nlm.h
+++ b/nlm/libnfs-raw-nlm.h
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #ifndef _NLM_H_RPCGEN
 #define _NLM_H_RPCGEN
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus

diff --git a/nsm/Makefile.am b/nsm/Makefile.am
index e0dcfaf8c55fc868cae0cf9d2ba0f4940153ea78..9e45099f0f134c58b723f1572c8987a04d3174d4 100644 (file)
--- a/nsm/Makefile.am
+++ b/nsm/Makefile.am
@@ -19,6 +19,6 @@ nsm-stamp : nsm.x
 
 compile_rpc:   
        cat nsm.x | head -29 >libnfs-raw-nsm.h
-       rpcgen -h nsm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nsm.h
+       rpcgen -h nsm.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nsm.h
        cat nsm.x | head -29 >libnfs-raw-nsm.c
        rpcgen -c nsm.x | sed -e "s/#include \".*nsm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nsm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nsm.c

diff --git a/nsm/libnfs-raw-nsm.h b/nsm/libnfs-raw-nsm.h
index 3c3d29645b6ed2f2c4fc190dab49486eef8b664f..e35e0c2015c9b949e7bd0e09557882ed58eaa9ff 100644 (file)
--- a/nsm/libnfs-raw-nsm.h
+++ b/nsm/libnfs-raw-nsm.h
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #ifndef _NSM_H_RPCGEN
 #define _NSM_H_RPCGEN
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus

diff --git a/portmap/Makefile.am b/portmap/Makefile.am
index a1d9c07949480fdf4334920147b6ffd56208f5a1..5fcccfa43f39af5bee1c14e7857239a6d52034cd 100644 (file)
--- a/portmap/Makefile.am
+++ b/portmap/Makefile.am
@@ -19,6 +19,6 @@ portmap-stamp : portmap.x
 
 compile_rpc:   
        cat portmap.x | head -29 >libnfs-raw-portmap.h
-       rpcgen -h portmap.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-portmap.h
+       rpcgen -h portmap.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-portmap.h
        cat portmap.x | head -29 >libnfs-raw-portmap.c
        rpcgen -c portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n        buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-portmap.c

diff --git a/portmap/libnfs-raw-portmap.h b/portmap/libnfs-raw-portmap.h
index 4c3fc903377d6feba04b4bc197623a50f89e4512..6036de9b7c5c9be88306e91873aa68737adbc912 100644 (file)
--- a/portmap/libnfs-raw-portmap.h
+++ b/portmap/libnfs-raw-portmap.h
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #ifndef _PORTMAP_H_RPCGEN
 #define _PORTMAP_H_RPCGEN
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus

diff --git a/rquota/Makefile.am b/rquota/Makefile.am
index a82b9fb73e736a565cacc68e15b904b0d0f24fad..fae3e1a8adc7b67fd4aa2850b525220374e96621 100644 (file)
--- a/rquota/Makefile.am
+++ b/rquota/Makefile.am
@@ -19,6 +19,6 @@ rquota-stamp : rquota.x
 
 compile_rpc:
        cat rquota.x | head -29 >libnfs-raw-rquota.h
-       rpcgen -h rquota.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-rquota.h
+       rpcgen -h rquota.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-rquota.h
        cat rquota.x | head -29 >libnfs-raw-rquota.c
        rpcgen -c rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n   buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-rquota.c

diff --git a/rquota/libnfs-raw-rquota.h b/rquota/libnfs-raw-rquota.h
index 2d75703c8bef2fd7c4a696fc5ec34826f76deb29..27ea104ad8637f1df9327f83ee79a45cc1cddbef 100644 (file)
--- a/rquota/libnfs-raw-rquota.h
+++ b/rquota/libnfs-raw-rquota.h
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #ifndef _RQUOTA_H_RPCGEN
 #define _RQUOTA_H_RPCGEN
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus