STABLE14-rxgen-ansi-again-20071101

ansified rxgen, for 1.4

(cherry picked from commit 8b8e0935e474cc2f79638b97134fa9e2d55adee8)

diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
index c6c0a916156698ecd321f1c8f9448e7e28ff2dc2..6ceac74ec24f84504b5ab42f812f67d5f5371643 100644 (file)
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -48,16 +48,16 @@ bosint.xdr.o: bosint.xdr.c ${RPCINCLS}
 bosint.cs.o: bosint.cs.c ${RPCINCLS}
 
 bosint.cs.c: bosint.xg
-       ${RXGEN} -x -C -o $@ ${srcdir}/bosint.xg
+       ${RXGEN} -x -A -C -o $@ ${srcdir}/bosint.xg
 
 bosint.ss.c: bosint.xg
-       ${RXGEN} -x -S -o $@ ${srcdir}/bosint.xg
+       ${RXGEN} -x -A -S -o $@ ${srcdir}/bosint.xg
 
 bosint.xdr.c: bosint.xg
-       ${RXGEN} -x -c -o $@ ${srcdir}/bosint.xg
+       ${RXGEN} -x -A -c -o $@ ${srcdir}/bosint.xg
 
 bosint.h: bosint.xg
-       ${RXGEN} -x -h -o $@ ${srcdir}/bosint.xg
+       ${RXGEN} -x -A -h -o $@ ${srcdir}/bosint.xg
 
 bosint.cs.c: bosint.h
 bosint.ss.c: bosint.h

diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in
index 77eec29d728697c46af6266070b7e1b637ee3515..21b37680d5d14e276a3858c932dbbd1406cfc4b5 100644 (file)
--- a/src/bubasics/Makefile.in
+++ b/src/bubasics/Makefile.in
@@ -18,16 +18,16 @@ libbubasics.a: $(OBJS) AFS_component_version_number.o
        ${RANLIB} libbubasics.a
 
 butc.xdr.c: butc.xg
-       ${RXGEN} -c -o $@ ${srcdir}/butc.xg
+       ${RXGEN} -A -c -o $@ ${srcdir}/butc.xg
 
 butc.ss.c: butc.xg
-       ${RXGEN} -S -o $@ ${srcdir}/butc.xg
+       ${RXGEN} -A -S -o $@ ${srcdir}/butc.xg
 
 butc.cs.c: butc.xg
-       ${RXGEN} -C -o $@ ${srcdir}/butc.xg
+       ${RXGEN} -A -C -o $@ ${srcdir}/butc.xg
 
 butc.h: butc.xg
-       ${RXGEN} -h -o $@ ${srcdir}/butc.xg
+       ${RXGEN} -A -h -o $@ ${srcdir}/butc.xg
 
 butc.xdr.c: butc.h
 butc.cs.c: butc.h

diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
index 7d50173aa9557fc26ee87d49aaf6de5622df3aef..4d3cbcf64a69654efa1ec7a074758af35f88b2d1 100644 (file)
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@@ -74,16 +74,16 @@ budb_server: $(SERVER_OBJS) ${LIBS}
        ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS}
 
 budb.cs.c: budb.rg
-       ${RXGEN} -u -C -o $@ ${srcdir}/budb.rg
+       ${RXGEN} -A -u -C -o $@ ${srcdir}/budb.rg
 
 budb.ss.c: budb.rg
-       ${RXGEN} -S -o $@ ${srcdir}/budb.rg
+       ${RXGEN} -A -S -o $@ ${srcdir}/budb.rg
 
 budb.xdr.c: budb.rg
-       ${RXGEN} -c -o $@ ${srcdir}/budb.rg
+       ${RXGEN} -A -c -o $@ ${srcdir}/budb.rg
 
 budb.h: budb.rg
-       ${RXGEN} -u -h -o $@ ${srcdir}/budb.rg
+       ${RXGEN} -A -u -h -o $@ ${srcdir}/budb.rg
 
 budb.cs.c: budb.h
 budb.xdr.c: budb.h

diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in
index 40cb7dafc3f9cd327528e1291b697dcbc128f2da..55ac0047d53637486012f42a469a0c6282ff6ccb 100644 (file)
--- a/src/fsint/Makefile.in
+++ b/src/fsint/Makefile.in
@@ -26,52 +26,52 @@ libafsint.a: ${OBJS} AFS_component_version_number.o
 afsaux.o: afsaux.c afsint.h
 
 Kcallback.cs.c: common.xg afscbint.xg Kvice.h Kcallback.h
-       ${RXGEN} -x -k -C -o Kcallback.cs.c ${srcdir}/afscbint.xg
+       ${RXGEN} -x -k -A -C -o Kcallback.cs.c ${srcdir}/afscbint.xg
 
 Kcallback.ss.c: common.xg afscbint.xg Kvice.h Kcallback.h
-       ${RXGEN} -x -k -S -o Kcallback.ss.c ${srcdir}/afscbint.xg
+       ${RXGEN} -x -k -A -S -o Kcallback.ss.c ${srcdir}/afscbint.xg
 
 Kcallback.xdr.c: common.xg afscbint.xg Kvice.h Kcallback.h
-       ${RXGEN} -x -k -y -c -o Kcallback.xdr.c ${srcdir}/afscbint.xg
+       ${RXGEN} -x -k -A -y -c -o Kcallback.xdr.c ${srcdir}/afscbint.xg
 
 Kvice.cs.c: common.xg afsint.xg Kvice.h
-       ${RXGEN} -x -k -C -o Kvice.cs.c ${srcdir}/afsint.xg
+       ${RXGEN} -x -k -A -C -o Kvice.cs.c ${srcdir}/afsint.xg
 
 Kvice.ss.c: common.xg afsint.xg Kvice.h
-       ${RXGEN} -x -k -S -o Kvice.ss.c ${srcdir}/afsint.xg
+       ${RXGEN} -x -k -A -S -o Kvice.ss.c ${srcdir}/afsint.xg
 
 Kvice.xdr.c: common.xg afsint.xg
-       ${RXGEN} -x -k -c -o Kvice.xdr.c ${srcdir}/afsint.xg
+       ${RXGEN} -x -k -A -c -o Kvice.xdr.c ${srcdir}/afsint.xg
 
 Kvice.h: common.xg afsint.xg
-       ${RXGEN} -x -k -h -o Kvice.h ${srcdir}/afsint.xg
+       ${RXGEN} -x -k -A -h -o Kvice.h ${srcdir}/afsint.xg
 
 Kcallback.h: common.xg afscbint.xg
-       ${RXGEN} -x -k -h -o Kcallback.h ${srcdir}/afscbint.xg
+       ${RXGEN} -x -k -A -h -o Kcallback.h ${srcdir}/afscbint.xg
 
 afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h 
-       ${RXGEN} -x -C -o afscbint.cs.c ${srcdir}/afscbint.xg
+       ${RXGEN} -x -A -C -o afscbint.cs.c ${srcdir}/afscbint.xg
 
 afscbint.ss.c: common.xg afscbint.xg afsint.h afscbint.h
-       ${RXGEN} -x -S -o afscbint.ss.c ${srcdir}/afscbint.xg
+       ${RXGEN} -x -A -S -o afscbint.ss.c ${srcdir}/afscbint.xg
 
 afscbint.xdr.c: common.xg afscbint.xg afsint.h afscbint.h
-       ${RXGEN} -x -y -c -o afscbint.xdr.c ${srcdir}/afscbint.xg
+       ${RXGEN} -x -y -A -c -o afscbint.xdr.c ${srcdir}/afscbint.xg
 
 afsint.cs.c: common.xg afsint.xg afsint.h
-       ${RXGEN} -x -C -o afsint.cs.c ${srcdir}/afsint.xg
+       ${RXGEN} -x -A -C -o afsint.cs.c ${srcdir}/afsint.xg
 
 afsint.ss.c: common.xg afsint.xg afsint.h
-       ${RXGEN} -x -S -o afsint.ss.c ${srcdir}/afsint.xg
+       ${RXGEN} -x -A -S -o afsint.ss.c ${srcdir}/afsint.xg
 
 afsint.xdr.c: common.xg afsint.xg
-       ${RXGEN} -x -c -o afsint.xdr.c ${srcdir}/afsint.xg
+       ${RXGEN} -x -A -c -o afsint.xdr.c ${srcdir}/afsint.xg
 
 afsint.h: common.xg afsint.xg
-       ${RXGEN} -x -h -o afsint.h ${srcdir}/afsint.xg
+       ${RXGEN} -x -A -h -o afsint.h ${srcdir}/afsint.xg
 
 afscbint.h: common.xg afscbint.xg
-       ${RXGEN} -x -h -o afscbint.h ${srcdir}/afscbint.xg
+       ${RXGEN} -x -A -h -o afscbint.h ${srcdir}/afscbint.xg
 
 #
 # Installation targets

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index a588e74293c7c2e57cc0953eec09a14718804aa2..e244a04c86ecad538ea45d76a5e4c220ea7c0c07 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -96,29 +96,29 @@ kauth.xdr.o: kauth.xdr.c kauth.h
 $(UKSRCS): kauth.h
 
 kauth.cs.c: kauth.rg
-       ${RXGEN} -u -x -C -o $@ ${srcdir}/kauth.rg
+       ${RXGEN} -A -u -x -C -o $@ ${srcdir}/kauth.rg
 
 kauth.ss.c: kauth.rg
-       ${RXGEN} -x -S -o $@ ${srcdir}/kauth.rg
+       ${RXGEN} -A -x -S -o $@ ${srcdir}/kauth.rg
 
 kauth.xdr.c: kauth.rg
-       ${RXGEN} -x -c -o $@ ${srcdir}/kauth.rg
+       ${RXGEN} -A -x -c -o $@ ${srcdir}/kauth.rg
 
 kauth.h: kauth.rg
-       ${RXGEN} -u -x -h -o $@ ${srcdir}/kauth.rg
+       ${RXGEN} -A -u -x -h -o $@ ${srcdir}/kauth.rg
 
 kauth.xdr.c: kauth.h
 kauth.cs.c: kauth.h
 kauth.ss.c: kauth.h
 
 Kkauth.cs.c: kauth.rg Kkauth.h
-       ${RXGEN} -x -k -C -o Kkauth.cs.c ${srcdir}/kauth.rg
+       ${RXGEN} -A -x -k -C -o Kkauth.cs.c ${srcdir}/kauth.rg
 
 Kkauth.xdr.c: kauth.rg
-       ${RXGEN} -x -k -c -o Kkauth.xdr.c ${srcdir}/kauth.rg
+       ${RXGEN} -A -x -k -c -o Kkauth.xdr.c ${srcdir}/kauth.rg
 
 Kkauth.h: kauth.rg
-       ${RXGEN} -x -k -h -o Kkauth.h ${srcdir}/kauth.rg
+       ${RXGEN} -A -x -k -h -o Kkauth.h ${srcdir}/kauth.rg
 
 libkauth.a: $(OBJS) AFS_component_version_number.o
        -$(RM) -f $@

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index 94cc15868f56869e199d2d66ac2890978860a4fa..4f9935e3b7687f37817982d490b51a4e4c7971a0 100644 (file)
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -75,29 +75,29 @@ ptint.cs.o: ptint.cs.c ptint.xdr.c ptint.xg
 ptint.xdr.o: ptint.xdr.c ptint.h ptint.xg
 
 ptint.cs.c: ptint.xg
-       ${RXGEN} -x -C -u -o $@ ${srcdir}/ptint.xg
+       ${RXGEN} -x -C -A -u -o $@ ${srcdir}/ptint.xg
 
 ptint.ss.c: ptint.xg
-       ${RXGEN} -x -S -o $@ ${srcdir}/ptint.xg
+       ${RXGEN} -x -S -A -o $@ ${srcdir}/ptint.xg
 
 ptint.xdr.c: ptint.xg
-       ${RXGEN} -x -c -o $@ ${srcdir}/ptint.xg
+       ${RXGEN} -x -c -A -o $@ ${srcdir}/ptint.xg
 
 ptint.h: ptint.xg
-       ${RXGEN} -x -h -u -o $@ ${srcdir}/ptint.xg
+       ${RXGEN} -x -h -A -u -o $@ ${srcdir}/ptint.xg
 
 ptint.cs.c: ptint.h
 ptint.ss.c: ptint.h
 ptint.xdr.c: ptint.h
 
 Kptint.cs.c: ptint.xg Kptint.h
-       ${RXGEN} -x -k -C -o Kptint.cs.c ${srcdir}/ptint.xg
+       ${RXGEN} -x -k -A -C -o Kptint.cs.c ${srcdir}/ptint.xg
  
 Kptint.xdr.c: ptint.xg
-       ${RXGEN} -x -k -c -o Kptint.xdr.c ${srcdir}/ptint.xg
+       ${RXGEN} -x -k -A -c -o Kptint.xdr.c ${srcdir}/ptint.xg
  
 Kptint.h: ptint.xg
-       ${RXGEN} -x -k -h -o Kptint.h ${srcdir}/ptint.xg
+       ${RXGEN} -x -k -A -h -o Kptint.h ${srcdir}/ptint.xg
 
 display.o: display.c ${INCLS}
 

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index d035a731b0292c7cd797cffe526870f6c7c04ce7..f127525fd2c65f54cc934922d4a540e0797a7bd0 100644 (file)
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -60,6 +60,7 @@ RCSID
 #define EXTEND 1               /* alias for TRUE */
 
 struct commandline {
+    int ansic_flag;
     int cflag;
     int hflag;
     int lflag;
@@ -87,6 +88,7 @@ int nincludes = 0;
 char *OutFileFlag = "";
 char OutFile[256];
 char Sflag = 0, Cflag = 0, hflag = 0, cflag = 0, kflag = 0, uflag = 0;
+char ansic_flag = 0;           /* If set, build ANSI C style prototypes */
 char zflag = 0;                        /* If set, abort server stub if rpc call returns non-zero */
 char xflag = 0;                        /* if set, add stats code to stubs */
 char yflag = 0;                        /* if set, only emit function name arrays to xdr file */
@@ -802,6 +804,7 @@ parseargs(int argc, char *argv[], struct commandline *cmd)
            for (j = 1; argv[i][j] != 0; j++) {
                c = argv[i][j];
                switch (c) {
+               case 'A':
                case 'c':
                case 'h':
                case 'l':
@@ -860,6 +863,7 @@ parseargs(int argc, char *argv[], struct commandline *cmd)
            ;
        }
     }
+    cmd->ansic_flag = ansic_flag = flag['A'];
     cmd->cflag = cflag = flag['c'];
     cmd->hflag = hflag = flag['h'];
     cmd->sflag = flag['s'];

diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c
index 55c708f054304ea70b97267a7247ac4b7ef28a91..d1d7e68bdeeeecc6590ed55d7eaf6ea09996b1f8 100644 (file)
--- a/src/rxgen/rpc_parse.c
+++ b/src/rxgen/rpc_parse.c
@@ -1110,20 +1110,29 @@ cs_Proc_CodeGeneration(definition * defp, int split_flag, char *procheader)
     }
 }
 
-
 static void
 cs_ProcName_setup(definition * defp, char *procheader, int split_flag)
 {
     proc1_list *plist;
+    char *first_arg;
 
-    if (!cflag) {
+    if (ansic_flag) {
        if (split_flag) {
-           f_print(fout, "int %s%s%s%s(z_call", procheader, prefix,
-                   PackagePrefix[PackageIndex], defp->pc.proc_name);
+           first_arg = "register struct rx_call *z_call";
        } else {
-           f_print(fout, "int %s%s%s%s(z_conn", procheader, prefix,
-                   PackagePrefix[PackageIndex], defp->pc.proc_name);
+           first_arg = "register struct rx_connection *z_conn";
        }
+    } else {
+       if (split_flag) {
+           first_arg = "z_call";
+       } else {
+           first_arg = "z_conn";
+       }
+    }
+
+    if (!cflag) {
+       f_print(fout, "int %s%s%s%s(%s", procheader, prefix,
+               PackagePrefix[PackageIndex], defp->pc.proc_name, first_arg);
     }
     if ((strlen(procheader) + strlen(prefix) +
         strlen(PackagePrefix[PackageIndex]) + strlen(defp->pc.proc_name)) >=
@@ -1133,20 +1142,32 @@ cs_ProcName_setup(definition * defp, char *procheader, int split_flag)
     if (!cflag) {
        for (plist = defp->pc.plists; plist; plist = plist->next) {
            if (plist->component_kind == DEF_PARAM) {
-               plist->pl.param_flag &= ~PROCESSED_PARAM;
-               f_print(fout, ", %s", plist->pl.param_name);
+               if (ansic_flag) {
+                   if (plist->pl.param_flag & OUT_STRING) {
+                       f_print(fout, ",%s *%s", plist->pl.param_type,
+                               plist->pl.param_name);
+                   } else {
+                       f_print(fout, ",%s %s", plist->pl.param_type,
+                               plist->pl.param_name);
+                   }
+               } else {
+                   f_print(fout, ", %s", plist->pl.param_name);    
+                   plist->pl.param_flag &= ~PROCESSED_PARAM;
+               }
            }
        }
        f_print(fout, ")\n");
     }
 }
 
-
 static void
 cs_ProcParams_setup(definition * defp, int split_flag)
 {
     proc1_list *plist, *plist1;
 
+    if (ansic_flag)
+       return;
+
     if (!split_flag)
        f_print(fout, "\tregister struct rx_connection *z_conn;\n");
     if (split_flag) {
@@ -1742,8 +1763,14 @@ ucs_ProcName_setup(definition * defp, char *procheader, int split_flag)
     proc1_list *plist;
 
     if (!cflag) {
-      f_print(fout, "int %s%s%s%s(aclient, aflags", procheader, prefix,
-             PackagePrefix[PackageIndex], defp->pc.proc_name);
+       if (ansic_flag) {
+           f_print(fout, "int %s%s%s%s(register struct ubik_client *aclient, afs_int32 aflags",
+                         procheader, prefix, PackagePrefix[PackageIndex],
+                         defp->pc.proc_name);
+       } else {
+           f_print(fout, "int %s%s%s%s(aclient, aflags", procheader, prefix,
+                         PackagePrefix[PackageIndex], defp->pc.proc_name);
+       }
     }
     if ((strlen(procheader) + strlen(prefix) +
         strlen(PackagePrefix[PackageIndex]) + strlen(defp->pc.proc_name)) >=
@@ -1753,8 +1780,18 @@ ucs_ProcName_setup(definition * defp, char *procheader, int split_flag)
     if (!cflag) {
        for (plist = defp->pc.plists; plist; plist = plist->next) {
            if (plist->component_kind == DEF_PARAM) {
-               plist->pl.param_flag &= ~PROCESSED_PARAM;
-               f_print(fout, ", %s", plist->pl.param_name);
+               if (ansic_flag) {
+                   if (plist->pl.param_flag & OUT_STRING) {
+                       f_print(fout, ",%s *%s", plist->pl.param_type,
+                               plist->pl.param_name);
+                   } else {
+                       f_print(fout, ",%s %s", plist->pl.param_type,
+                               plist->pl.param_name);
+                   }
+               } else {
+                   plist->pl.param_flag &= ~PROCESSED_PARAM;
+                   f_print(fout, ", %s", plist->pl.param_name);
+               }
            }
        }
        f_print(fout, ")\n");
@@ -1767,6 +1804,9 @@ ucs_ProcParams_setup(definition * defp, int split_flag)
 {
     proc1_list *plist, *plist1;
 
+    if (ansic_flag)
+       return;
+
     f_print(fout, "\tregister struct ubik_client *aclient;\n\tafs_int32 aflags;\n");
     for (plist = defp->pc.plists; plist; plist = plist->next) {
        if (plist->component_kind == DEF_PARAM

diff --git a/src/rxgen/rpc_util.h b/src/rxgen/rpc_util.h
index 86e4894e52ff492b5ced5b14e15c8e7751836fe1..3722421f45e94b70374cbc86ea8d14d6e24384b3 100644 (file)
--- a/src/rxgen/rpc_util.h
+++ b/src/rxgen/rpc_util.h
@@ -57,6 +57,7 @@ extern int nincludes;
 extern char *OutFileFlag;
 extern char OutFile[];
 extern char Sflag, Cflag, hflag, cflag, kflag, uflag;
+extern char ansic_flag;
 extern char zflag;
 extern char xflag;
 extern char yflag;

diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in
index 588b5552d115eeff2c614cfce0d33af12136e747..4850bf2c9dde18fb97c719f229a0785a6095c792 100644 (file)
--- a/src/rxstat/Makefile.in
+++ b/src/rxstat/Makefile.in
@@ -19,16 +19,16 @@ depinstall: \
 # Build targets
 #
 rxstat.cs.c: rxstat.xg
-       ${RXGEN} -x -C -o $@ ${srcdir}/rxstat.xg
+       ${RXGEN} -A -x -C -o $@ ${srcdir}/rxstat.xg
 
 rxstat.ss.c: rxstat.xg
-       ${RXGEN} -x -S -o $@ ${srcdir}/rxstat.xg
+       ${RXGEN} -A -x -S -o $@ ${srcdir}/rxstat.xg
 
 rxstat.xdr.c: rxstat.xg
-       ${RXGEN} -x -c -o $@ ${srcdir}/rxstat.xg
+       ${RXGEN} -A -x -c -o $@ ${srcdir}/rxstat.xg
 
 rxstat.h: rxstat.xg
-       ${RXGEN} -x -h -o $@ ${srcdir}/rxstat.xg
+       ${RXGEN} -A -x -h -o $@ ${srcdir}/rxstat.xg
 
 rxstat.xdr.c: rxstat.h
 rxstat.cs.c: rxstat.h

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index e116a03bd477604a86bb04c808d79ae7f35b996f..1e1a86ccb988a3bc9e8b3c9371424ffda7cc73e1 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -95,16 +95,16 @@ rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h
 rmtsysd: AFS_component_version_number.o afs.exp afsl.exp
 
 rmtsys.cs.c: rmtsys.xg
-       ${RXGEN} -C -o $@ ${srcdir}/rmtsys.xg
+       ${RXGEN} -A -C -o $@ ${srcdir}/rmtsys.xg
 
 rmtsys.ss.c: rmtsys.xg
-       ${RXGEN} -S -o $@ ${srcdir}/rmtsys.xg
+       ${RXGEN} -A -S -o $@ ${srcdir}/rmtsys.xg
 
 rmtsys.xdr.c: rmtsys.xg
-       ${RXGEN} -c -o $@ ${srcdir}/rmtsys.xg
+       ${RXGEN} -A -c -o $@ ${srcdir}/rmtsys.xg
 
 rmtsys.h: rmtsys.xg
-       ${RXGEN} -h -o $@ ${srcdir}/rmtsys.xg
+       ${RXGEN} -A -h -o $@ ${srcdir}/rmtsys.xg
 
 rmtsysd: rmtsysd.o libsys.a
        ${CC} ${CFLAGS} -o rmtsysd rmtsysd.o ${LIBS}

diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index 018173863f2f78990a41366a3cbe06c7ddde58fc..28ae354f8bafcb3fad0a0bda81d179c86b9c84b8 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -37,45 +37,45 @@ udebug: udebug.o libubik.a
        ${CC} ${CFLAGS} -o udebug udebug.o libubik.a $(LIBS)
 
 ubik_int.cs.c: ubik_int.xg
-       ${RXGEN} -x -C -o $@ ${srcdir}/ubik_int.xg
+       ${RXGEN} -x -A -C -o $@ ${srcdir}/ubik_int.xg
 
 ubik_int.ss.c: ubik_int.xg
-       ${RXGEN} -x -S -o $@ ${srcdir}/ubik_int.xg
+       ${RXGEN} -x -A -S -o $@ ${srcdir}/ubik_int.xg
 
 ubik_int.xdr.c: ubik_int.xg
-       ${RXGEN} -x -c -o $@ ${srcdir}/ubik_int.xg
+       ${RXGEN} -x -A -c -o $@ ${srcdir}/ubik_int.xg
 
 ubik_int.h: ubik_int.xg
-       ${RXGEN} -x -h -o $@ ${srcdir}/ubik_int.xg
+       ${RXGEN} -x -A -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: ubik_int.xg Kubik_int.h
-       ${RXGEN} -x -k -C -o Kubik_int.cs.c ${srcdir}/ubik_int.xg
+       ${RXGEN} -x -k -A -C -o Kubik_int.cs.c ${srcdir}/ubik_int.xg
  
 Kubik_int.xdr.c: ubik_int.xg
-       ${RXGEN} -x -k -c -o Kubik_int.xdr.c ${srcdir}/ubik_int.xg
+       ${RXGEN} -x -k -A -c -o Kubik_int.xdr.c ${srcdir}/ubik_int.xg
  
 Kubik_int.h: ubik_int.xg
-       ${RXGEN} -x -k -h -o Kubik_int.h ${srcdir}/ubik_int.xg
+       ${RXGEN} -x -k -A -h -o Kubik_int.h ${srcdir}/ubik_int.xg
 
 utst_int.ss.o: utst_int.ss.c utst_int.xdr.c
 utst_int.cs.o: utst_int.cs.c utst_int.xdr.c
 utst_int.xdr.o: utst_int.xdr.c utst_int.h
 
 utst_int.cs.c: utst_int.xg
-       ${RXGEN} -C -o $@ ${srcdir}/utst_int.xg
+       ${RXGEN} -A -C -o $@ ${srcdir}/utst_int.xg
 
 utst_int.ss.c: utst_int.xg
-       ${RXGEN} -S -o $@ ${srcdir}/utst_int.xg
+       ${RXGEN} -A -S -o $@ ${srcdir}/utst_int.xg
 
 utst_int.xdr.c: utst_int.xg
-       ${RXGEN} -c -o $@ ${srcdir}/utst_int.xg
+       ${RXGEN} -A -c -o $@ ${srcdir}/utst_int.xg
 
 utst_int.h: utst_int.xg
-       ${RXGEN} -h -o $@ ${srcdir}/utst_int.xg
+       ${RXGEN} -A -h -o $@ ${srcdir}/utst_int.xg
 
 utst_int.cs.c: utst_int.h
 utst_int.ss.c: utst_int.h

diff --git a/src/update/Makefile.in b/src/update/Makefile.in
index 1ad24aabb9b11ca5b78c2af6c70b53a71a6c1ba9..5842c1d3a8abedb2e75c4b13fadd240e71a1f932 100644 (file)
--- a/src/update/Makefile.in
+++ b/src/update/Makefile.in
@@ -33,16 +33,16 @@ utils.o: utils.c update.h global.h
 client.o server.o: update.h global.h AFS_component_version_number.c
 
 update.cs.c: update.xg
-       ${RXGEN} -u -C -o $@ ${srcdir}/update.xg
+       ${RXGEN} -A -u -C -o $@ ${srcdir}/update.xg
 
 update.ss.c: update.xg
-       ${RXGEN} -S -o $@ ${srcdir}/update.xg
+       ${RXGEN} -A -S -o $@ ${srcdir}/update.xg
 
 update.xdr.c: update.xg
-       ${RXGEN} -c -o $@ ${srcdir}/update.xg
+       ${RXGEN} -A -c -o $@ ${srcdir}/update.xg
 
 update.h: update.xg
-       ${RXGEN} -u -h -o $@ ${srcdir}/update.xg
+       ${RXGEN} -A -u -h -o $@ ${srcdir}/update.xg
 
 update.cs.c: update.h
 upcate.ss.c: update.h

diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
index 32a2ae25fbfd13e2354550bfa6a2f29bd9e6b154..d4d45a869b57871362187457c3d892b5a63c7071 100644 (file)
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@@ -72,26 +72,26 @@ vldbint.cs.o: vldbint.cs.c vldbint.xdr.c
 vldbint.xdr.o: vldbint.xdr.c vldbint.h
 
 vldbint.cs.c: vldbint.xg
-       ${RXGEN} -u -x -C -o $@ ${srcdir}/vldbint.xg
+       ${RXGEN} -A -u -x -C -o $@ ${srcdir}/vldbint.xg
 
 vldbint.ss.c: vldbint.xg
-       ${RXGEN} -x -S -o $@ ${srcdir}/vldbint.xg
+       ${RXGEN} -A -x -S -o $@ ${srcdir}/vldbint.xg
 
 vldbint.xdr.c: vldbint.xg
-       ${RXGEN} -x -c -o $@ ${srcdir}/vldbint.xg
+       ${RXGEN} -A -x -c -o $@ ${srcdir}/vldbint.xg
 
 vldbint.h: vldbint.xg
-       ${RXGEN} -u -x -h -o $@ ${srcdir}/vldbint.xg
+       ${RXGEN} -A -u -x -h -o $@ ${srcdir}/vldbint.xg
 
 vldbint.cs.c: vldbint.h
 vldbint.ss.c: vldbint.h
 vldbint.xdr.c: vldbint.h
 
 Kvldbint.cs.c: vldbint.xg
-       ${RXGEN} -x -k -C -o $@ ${srcdir}/vldbint.xg
+       ${RXGEN} -A -x -k -C -o $@ ${srcdir}/vldbint.xg
 
 Kvldbint.xdr.c: vldbint.xg
-       ${RXGEN} -x -k -c -o $@ ${srcdir}/vldbint.xg
+       ${RXGEN} -A -x -k -c -o $@ ${srcdir}/vldbint.xg
 
 libvldb.a: $(OBJS) AFS_component_version_number.o
        $(RM) -f $@

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index 8a2fbff1d13d02ebc764dbdddb089900c970b7ce..7952b410e295849afe68b1e4f55300b55cd40f3d 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -83,16 +83,16 @@ volser.h volerr.c: volerr.et volser.p.h
        ${COMPILE_ET} -p ${srcdir} volerr -h volser
 
 volint.cs.c: volint.xg
-       ${RXGEN} -x -C -o $@ ${srcdir}/volint.xg
+       ${RXGEN} -A -x -C -o $@ ${srcdir}/volint.xg
 
 volint.ss.c: volint.xg
-       ${RXGEN} -x -S -o $@ ${srcdir}/volint.xg
+       ${RXGEN} -A -x -S -o $@ ${srcdir}/volint.xg
 
 volint.xdr.c: volint.xg
-       ${RXGEN} -x -c -o $@ ${srcdir}/volint.xg
+       ${RXGEN} -A -x -c -o $@ ${srcdir}/volint.xg
 
 volint.h: volint.xg
-       ${RXGEN} -x -h -o $@ ${srcdir}/volint.xg
+       ${RXGEN} -A -x -h -o $@ ${srcdir}/volint.xg
 
 volint.cs.c: volint.h
 volint.ss.c: volint.h