From 6beb32f0e059d1dbfbf82260a9103665aba88565 Mon Sep 17 00:00:00 2001
From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 25 Jan 2010 17:05:09 -0600
Subject: [PATCH] Use -A and -u in pthreaded ubik rxgen

Use -A for rxgen in tvlserver and tptserver to generate ANSI code, so we
don't generate warnings. Also use -u in tubik rxgen, so we generate the
ubik_* functions that new code uses.

Change-Id: Id13168e65e36aeebf48610c28e7b3df2164fc073
Reviewed-on: http://gerrit.openafs.org/1210
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---
 src/tptserver/Makefile.in | 16 ++++++++--------
 src/tubik/Makefile.in     | 22 +++++++++++-----------
 src/tvlserver/Makefile.in | 12 ++++++------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 685534e..e25a922 100644
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -143,29 +143,29 @@ ptint.xdr.o: ptint.xdr.c
 	${CCRULE}
 
 ptint.cs.c: ${PTSERVER}/ptint.xg
-	${RXGEN} -x -C -u -o $@ ${PTSERVER}/ptint.xg
+	${RXGEN} -A -x -C -u -o $@ ${PTSERVER}/ptint.xg
 
 ptint.ss.c: ${PTSERVER}/ptint.xg
-	${RXGEN} -x -S -o $@ ${PTSERVER}/ptint.xg
+	${RXGEN} -A -x -S -o $@ ${PTSERVER}/ptint.xg
 
 ptint.xdr.c: ${PTSERVER}/ptint.xg
-	${RXGEN} -x -c -o $@ ${PTSERVER}/ptint.xg
+	${RXGEN} -A -x -c -o $@ ${PTSERVER}/ptint.xg
 
 ptint.h: ${PTSERVER}/ptint.xg
-	${RXGEN} -x -h -u -o $@ ${PTSERVER}/ptint.xg
+	${RXGEN} -A -x -h -u -o $@ ${PTSERVER}/ptint.xg
 
 ptint.cs.c: ptint.h
 ptint.ss.c: ptint.h
 ptint.xdr.c: ptint.h
 
 Kptint.cs.c: ${PTSERVER}/ptint.xg Kptint.h
-	${RXGEN} -x -k -C -o Kptint.cs.c ${PTSERVER}/ptint.xg
+	${RXGEN} -A -x -k -C -o Kptint.cs.c ${PTSERVER}/ptint.xg
  
 Kptint.xdr.c: ${PTSERVER}/ptint.xg
-	${RXGEN} -x -k -c -o Kptint.xdr.c ${PTSERVER}/ptint.xg
+	${RXGEN} -A -x -k -c -o Kptint.xdr.c ${PTSERVER}/ptint.xg
  
 Kptint.h: ${PTSERVER}/ptint.xg
-	${RXGEN} -x -k -h -o Kptint.h ${PTSERVER}/ptint.xg
+	${RXGEN} -A -x -k -h -o Kptint.h ${PTSERVER}/ptint.xg
 
 display.o: ${PTSERVER}/display.c
 	${CCRULE}
@@ -280,4 +280,4 @@ dest: \
 	${DEST}/root.server/usr/afs/bin/pts \
 	${DEST}/bin/pts \
 	${DEST}/root.server/usr/afs/bin/pt_util \
-	${DEST}/etc/prdb_check
\ No newline at end of file
+	${DEST}/etc/prdb_check
diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in
index a73a26f..c475585 100644
--- a/src/tubik/Makefile.in
+++ b/src/tubik/Makefile.in
@@ -117,29 +117,29 @@ udebug: udebug.o libubik_pthread.a ${RXOBJS} ${UTILOBJS}
 	${CC} ${CFLAGS} -o udebug udebug.o libubik_pthread.a $(LIBS)
 
 ubik_int.cs.c: ${srcdir}/ubik_int.xg
-	${RXGEN} -x -C -o $@ ${srcdir}/ubik_int.xg
+	${RXGEN} -A -x -C -o $@ ${srcdir}/ubik_int.xg
 
 ubik_int.ss.c: ${srcdir}/ubik_int.xg
-	${RXGEN} -x -S -o $@ ${srcdir}/ubik_int.xg
+	${RXGEN} -A -x -S -o $@ ${srcdir}/ubik_int.xg
 
 ubik_int.xdr.c: ${srcdir}/ubik_int.xg
-	${RXGEN} -x -c -o $@ ${srcdir}/ubik_int.xg
+	${RXGEN} -A -x -c -o $@ ${srcdir}/ubik_int.xg
 
 ubik_int.h: ${srcdir}/ubik_int.xg
-	${RXGEN} -x -h -o $@ ${srcdir}/ubik_int.xg
+	${RXGEN} -A -x -h -o $@ ${srcdir}/ubik_int.xg
 
 ubik_int.cs.c: ubik_int.h
 ubik_int.ss.c: ubik_int.h
 ubik_int.xdr.c: ubik_int.h
 
 Kubik_int.cs.c: ${srcdir}/ubik_int.xg Kubik_int.h
-	${RXGEN} -x -k -C -o Kubik_int.cs.c ${srcdir}/ubik_int.xg
+	${RXGEN} -A -x -k -C -o Kubik_int.cs.c ${srcdir}/ubik_int.xg
  
 Kubik_int.xdr.c: ${srcdir}/ubik_int.xg
-	${RXGEN} -x -k -c -o Kubik_int.xdr.c ${srcdir}/ubik_int.xg
+	${RXGEN} -A -x -k -c -o Kubik_int.xdr.c ${srcdir}/ubik_int.xg
  
 Kubik_int.h: ${srcdir}/ubik_int.xg
-	${RXGEN} -x -k -h -o Kubik_int.h ${srcdir}/ubik_int.xg
+	${RXGEN} -A -x -k -h -o Kubik_int.h ${srcdir}/ubik_int.xg
 
 utst_int.ss.o: utst_int.ss.c utst_int.xdr.c
 	${CCRULE}
@@ -151,16 +151,16 @@ utst_int.xdr.o: utst_int.xdr.c utst_int.h
 	${CCRULE}
 
 utst_int.cs.c: ${srcdir}/utst_int.xg
-	${RXGEN} -C -o $@ ${srcdir}/utst_int.xg
+	${RXGEN} -A -C -u -o $@ ${srcdir}/utst_int.xg
 
 utst_int.ss.c: ${srcdir}/utst_int.xg
-	${RXGEN} -S -o $@ ${srcdir}/utst_int.xg
+	${RXGEN} -A -S -o $@ ${srcdir}/utst_int.xg
 
 utst_int.xdr.c: ${srcdir}/utst_int.xg
-	${RXGEN} -c -o $@ ${srcdir}/utst_int.xg
+	${RXGEN} -A -c -o $@ ${srcdir}/utst_int.xg
 
 utst_int.h: ${srcdir}/utst_int.xg
-	${RXGEN} -h -o $@ ${srcdir}/utst_int.xg
+	${RXGEN} -A -h -u -o $@ ${srcdir}/utst_int.xg
 
 utst_int.cs.c: utst_int.h
 utst_int.ss.c: utst_int.h
diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index b7bbcce..d1a2611 100644
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -148,26 +148,26 @@ vldbint.xdr.o: vldbint.xdr.c
 	${CCRULE}
 
 vldbint.cs.c: ${VLSERVER}/vldbint.xg
-	${RXGEN} -u -x -C -o $@ ${VLSERVER}/vldbint.xg
+	${RXGEN} -A -u -x -C -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.ss.c: ${VLSERVER}/vldbint.xg
-	${RXGEN} -x -S -o $@ ${VLSERVER}/vldbint.xg
+	${RXGEN} -A -x -S -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.xdr.c: ${VLSERVER}/vldbint.xg
-	${RXGEN} -x -c -o $@ ${VLSERVER}/vldbint.xg
+	${RXGEN} -A -x -c -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.h: ${VLSERVER}/vldbint.xg
-	${RXGEN} -u -x -h -o $@ ${VLSERVER}/vldbint.xg
+	${RXGEN} -A -u -x -h -o $@ ${VLSERVER}/vldbint.xg
 
 vldbint.cs.c: vldbint.h
 vldbint.ss.c: vldbint.h
 vldbint.xdr.c: vldbint.h
 
 Kvldbint.cs.c: ${VLSERVER}/vldbint.xg
-	${RXGEN} -x -k -C -o $@ ${VLSERVER}/vldbint.xg
+	${RXGEN} -A -x -k -C -o $@ ${VLSERVER}/vldbint.xg
 
 Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg
-	${RXGEN} -x -k -c -o $@ ${VLSERVER}/vldbint.xg
+	${RXGEN} -A -x -k -c -o $@ ${VLSERVER}/vldbint.xg
 
 vlclient: vlclient.o $(OBJS) $(LIBS) 
 	$(CC) ${LDFLAGS} -o vlclient vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libcmd.a
-- 
1.9.4