X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=nfs%2FMakefile.am;h=de62dcee0c4826c694177b1451e418f1681961ad;hb=HEAD;hp=51b8d928fb0fcd9b6ea2df2217c79a98d5ff5c7b;hpb=6b93021bbf87092def5f83c377644234d4bfa97a;p=deb_libnfs.git

diff --git a/nfs/Makefile.am b/nfs/Makefile.am
index 51b8d92..de62dce 100644
--- a/nfs/Makefile.am
+++ b/nfs/Makefile.am
@@ -1,48 +1,24 @@
 noinst_LTLIBRARIES = libnfs.la
 
-nfs_SOURCES_GENERATED = libnfs-raw-nfs.c
-nfs_HEADERS_GENERATED = libnfs-raw-nfs.h
+nfs_SOURCES_GENERATED =
+nfs_HEADERS_GENERATED =
 nfs_GENERATED = $(nfs_SOURCES_GENERATED) $(nfs_HEADERS_GENERATED)
 
 CLEANFILES = $(nfs_GENERATED) nfs-stamp
 
-libnfs_la_CPPFLAGS = -I$(abs_top_srcdir)/include
+libnfs_la_CPPFLAGS = -I$(abs_top_srcdir)/include \
+		     -I$(abs_top_srcdir)/include/nfsc
 libnfs_la_SOURCES = \
 	$(nfs_SOURCES_GENERATED) \
-	nfs.c nfsacl.c
+	nfs.c nfsacl.c libnfs-raw-nfs.c libnfs-raw-nfs.h
 
 $(nfs_GENERATED) : nfs-stamp
 nfs-stamp : nfs.x
 	rm -f $(nfs_GENERATED)
-	rpcgen -h @RPCGENFLAGS@ $< > libnfs-raw-nfs.h
-	rpcgen -c @RPCGENFLAGS@ $< | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-raw-nfs.h\"/" -e "s/^xdr_uint64/static xdr_uint64_broken/" > libnfs-raw-nfs.c
-	echo "" >> libnfs-raw-nfs.c
-	echo "xdr_uint64 (XDR *xdrs, uint64 *objp)" >> libnfs-raw-nfs.c
-	echo "{" >> libnfs-raw-nfs.c
-	echo "	uint32_t i;" >> libnfs-raw-nfs.c
-	echo "" >> libnfs-raw-nfs.c
-	echo "        switch (xdrs->x_op) {" >> libnfs-raw-nfs.c
-	echo "        case XDR_DECODE:" >> libnfs-raw-nfs.c
-	echo "		if (!xdr_u_int (xdrs, &i))" >> libnfs-raw-nfs.c
-	echo "			return FALSE;" >> libnfs-raw-nfs.c
-	echo "		*objp = i;" >> libnfs-raw-nfs.c
-	echo "		*objp <<= 32;" >> libnfs-raw-nfs.c
-	echo "" >> libnfs-raw-nfs.c
-	echo "		if (!xdr_u_int (xdrs, &i))" >> libnfs-raw-nfs.c
-	echo "			return FALSE;" >> libnfs-raw-nfs.c
-	echo "		*objp |= i;" >> libnfs-raw-nfs.c
-	echo "" >> libnfs-raw-nfs.c
-	echo "		return TRUE;" >> libnfs-raw-nfs.c
-	echo "	case XDR_ENCODE:" >> libnfs-raw-nfs.c
-	echo "		i = ((*objp) >> 32) & 0xffffffff;" >> libnfs-raw-nfs.c
-	echo "		if (!xdr_u_int (xdrs, &i))" >> libnfs-raw-nfs.c
-	echo "			return FALSE;" >> libnfs-raw-nfs.c
-	echo "" >> libnfs-raw-nfs.c
-	echo "		i = ((*objp)      ) & 0xffffffff;" >> libnfs-raw-nfs.c
-	echo "		if (!xdr_u_int (xdrs, &i))" >> libnfs-raw-nfs.c
-	echo "			return FALSE;" >> libnfs-raw-nfs.c
-	echo "		return TRUE;" >> libnfs-raw-nfs.c
-	echo "	}" >> libnfs-raw-nfs.c
-	echo "}" >> libnfs-raw-nfs.c
 	touch nfs-stamp
-	
+
+compile_rpc:	
+	cat nfs.x | head -29 >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/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