makefiles-attempt-to-support-gmake-j-20011023

move toward being able to gmake -j openafs

diff --git a/Makefile.in b/Makefile.in
index 5903a35..30caac7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,6 +115,11 @@ dest_dirs: force
        mkdir -p ${DEST}/root.server/etc
        mkdir -p ${DEST}/root.server/usr/afs/bin
 
+# This is needed to get these dirs built prior to stuff being installed into them
+build_dirs_rx:
+       mkdir -p ${TOP_OBJDIR}/src/libafs/rx
+       mkdir -p ${TOP_OBJDIR}/src/libuafs/rx
+       
 project: cmd comerr 
 
 config: 
@@ -149,27 +154,19 @@ lwp: project util
 rxgen: pinstall
        ${COMPILE_PART1} rxgen ${COMPILE_PART2}
 
-rxobj:
-
-kernrx: 
-       ${COMPILE_PART1} rx ${COMPILE_PART2}
-
-rx: project lwp rxgen
+rx: project lwp rxgen build_dirs_rx
        ${COMPILE_PART1} rx ${COMPILE_PART2}
 
 rxstat: rx
        ${COMPILE_PART1} rxstat ${COMPILE_PART2}
 
-rxincls: rxobj
-       ${COMPILE_PART1} rx ${COMPILE_PART2}
-
 rxtests: rxdebug
-rxdebug: rx
+rxdebug: rx sys
        ${COMPILE_PART1} rxdebug ${COMPILE_PART2}
 
 fsint: project kfsint
 
-kfsint: lwp rxgen rxincls
+kfsint: lwp rxgen rx
        ${COMPILE_PART1} fsint ${COMPILE_PART2}
 
 export2: project fsint
@@ -185,18 +182,15 @@ export: fsint
 afs: export
        ${COMPILE_PART1} afs ${COMPILE_PART2}
 
-des: config
+des: config pinstall
        ${COMPILE_PART1} des ${COMPILE_PART2} 
 
 sys: project afs des rx rxstat fsint
        ${COMPILE_PART1} sys ${COMPILE_PART2}
 
-rxkad: project des
+rxkad: project des rx
        ${COMPILE_PART1} rxkad ${COMPILE_PART2}
 
-kernauth: 
-       ${COMPILE_PART1} auth ${COMPILE_PART2}
-
 auth: project comerr des lwp rx sys rxkad audit
        ${COMPILE_PART1} auth ${COMPILE_PART2}
 
@@ -211,15 +205,12 @@ ptserver: project ubik cmd comerr auth audit
 kauth: project ubik cmd auth comerr ptserver audit libacl
        ${COMPILE_PART1} kauth ${COMPILE_PART2}
 
-dauth: project ubik cmd auth comerr
+dauth: project ubik cmd auth kauth comerr
        ${COMPILE_PART1} dauth ${COMPILE_PART2}
 
 libacl: project ptserver
        ${COMPILE_PART1} libacl ${COMPILE_PART2}
 
-kerndir: 
-       ${COMPILE_PART1} dir ${COMPILE_PART2}
-
 dir: project libacl
        ${COMPILE_PART1} dir ${COMPILE_PART2}
 
@@ -272,16 +263,16 @@ ${TOP_LIBDIR}/libtermlib.a:
                ln -s /usr/lib/libtermlib.a ${TOP_LIBDIR}/libtermlib.a ;; \
        esac
 
-gtx: project null auth ${TOP_LIBDIR}/libtermlib.a
+gtx: project null auth kauth ${TOP_LIBDIR}/libtermlib.a
        ${COMPILE_PART1} gtx ${COMPILE_PART2}
 
-fsprobe: project util fsint
+fsprobe: project util fsint volser
        ${COMPILE_PART1} fsprobe ${COMPILE_PART2}
 
 scout: project gtx fsprobe
        ${COMPILE_PART1} scout ${COMPILE_PART2}
 
-uss: des kauth project rx vlserver vol
+uss: des kauth project rx vlserver vol volser
        ${COMPILE_PART1} uss ${COMPILE_PART2}
 
 bozo: project ntp audit
@@ -352,7 +343,7 @@ UKERNELDIR= \
   rxstat
 
 
-libafs: libafs_setup ${KERNELDIR}
+libafs: lwp libafs_setup ${KERNELDIR}
        ${COMPILE_PART1} libafs ${COMPILE_PART2}
 
 libafs_tree: libafs_setup ${KERNELDIR}
@@ -380,7 +371,7 @@ libafs_tree: libafs_setup ${KERNELDIR}
                ${INSTALL} -c src/afs/LINUX/osi_vfs.hin libafs_tree/afs ;; \
        esac
 
-libuafs: libuafs_setup ${UKERNELDIR}
+libuafs: lwp libuafs_setup ${UKERNELDIR}
        set -x; \
        case ${SYS_NAME} in \
        hp_ux102* | *_obsd* ) \
@@ -398,19 +389,19 @@ update: project auth
 log: project auth 
        ${COMPILE_PART1} log ${COMPILE_PART2}
 
-bu_utils: project
+bu_utils: project usd
        ${COMPILE_PART1} bu_utils ${COMPILE_PART2}
 
 usd: project
        ${COMPILE_PART1} usd ${COMPILE_PART2}
 
-bubasics: project comerr
+bubasics: project comerr rx
        ${COMPILE_PART1} bubasics ${COMPILE_PART2}
 
-butm: project bubasics usd
+butm: project bubasics usd uss
        ${COMPILE_PART1} butm ${COMPILE_PART2}
 
-butc: project bubasics butm budb bucoord cmd
+butc: project bubasics butm budb bucoord cmd rxgen rx
        ${COMPILE_PART1} butc ${COMPILE_PART2}
 
 tbutc: project bubasics butm budb bucoord cmd butc
@@ -421,13 +412,13 @@ tbutc: project bubasics butm budb bucoord cmd butc
                echo Not building MT butc for ${SYS_NAME} ;; \
        esac
 
-budb: project bubasics
+budb: project bubasics uss
        ${COMPILE_PART1} budb ${COMPILE_PART2}
 
 bucoord: project bubasics budb volser
        ${COMPILE_PART1} bucoord ${COMPILE_PART2}
 
-xstat: project
+xstat: project fsint viced
        ${COMPILE_PART1} xstat ${COMPILE_PART2}
 
 afsmonitor: project gtx xstat

diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index 8794744..73352e2 100644 (file)
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -72,10 +72,10 @@ libauth.krb.a: $(KOBJS) AFS_component_version_number.o
        $(AR) crv $@ $(KOBJS) AFS_component_version_number.o
        $(RANLIB) $@
 
-copyauth: copyauth.o
+copyauth: copyauth.o ${LIBS}
        $(CC) $(CFLAGS) -o copyauth copyauth.o ${LIBS}
 
-setkey: setkey.o
+setkey: setkey.o ${LIBS}
        ${CC} $(CFLAGS) -o setkey setkey.o ${LIBS}
 
 acfg_errors.o: acfg_errors.c

diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
index 8e56b70..037de21 100644 (file)
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -71,8 +71,21 @@ bosint.ss.o: bosint.ss.c ${RPCINCLS}
 bosint.xdr.o: bosint.xdr.c ${RPCINCLS}
 bosint.cs.o: bosint.cs.c ${RPCINCLS}
 
-bosint.xdr.c bosint.ss.c bosint.cs.c bosint.h: bosint.xg
-       ${RXGEN} -x ${srcdir}/bosint.xg
+bosint.cs.c: bosint.xg
+       ${RXGEN} -x -C -o $@ ${srcdir}/bosint.xg
+
+bosint.ss.c: bosint.xg
+       ${RXGEN} -x -S -o $@ ${srcdir}/bosint.xg
+
+bosint.xdr.c: bosint.xg
+       ${RXGEN} -x -c -o $@ ${srcdir}/bosint.xg
+
+bosint.h: bosint.xg
+       ${RXGEN} -x -h -o $@ ${srcdir}/bosint.xg
+
+bosint.cs.c: bosint.h
+bosint.ss.c: bosint.h
+bosint.xdr.c: bosint.h
 
 bnode.h boserr.c: bnode.p.h boserr.et
        $(RM) -f boserr.c bnode.h

diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in
index ad6ef9a..cf7b774 100644 (file)
--- a/src/bubasics/Makefile.in
+++ b/src/bubasics/Makefile.in
@@ -43,11 +43,37 @@ libbubasics.a: $(OBJS) AFS_component_version_number.o
        ar r libbubasics.a ${OBJS} AFS_component_version_number.o
        ${RANLIB} libbubasics.a
 
-butc.xdr.c butc.ss.c butc.cs.c butc.h: butc.xg
-       ${RXGEN} ${srcdir}/butc.xg
+butc.xdr.c: butc.xg
+       ${RXGEN} -c -o $@ ${srcdir}/butc.xg
 
-bumon.xdr.c bumon.ss.c bumon.cs.c bumon.h: bumon.xg
-       ${RXGEN} ${srcdir}/bumon.xg
+butc.ss.c: butc.xg
+       ${RXGEN} -S -o $@ ${srcdir}/butc.xg
+
+butc.cs.c: butc.xg
+       ${RXGEN} -C -o $@ ${srcdir}/butc.xg
+
+butc.h: butc.xg
+       ${RXGEN} -h -o $@ ${srcdir}/butc.xg
+
+butc.xdr.c: butc.h
+butc.cs.c: butc.h
+butc.ss.c: butc.h
+
+bumon.xdr.c: bumon.xg
+       ${RXGEN} -c -o $@ ${srcdir}/bumon.xg
+
+bumon.ss.c: bumon.xg
+       ${RXGEN} -S -o $@ ${srcdir}/bumon.xg
+
+bumon.cs.c: bumon.xg
+       ${RXGEN} -C -o $@ ${srcdir}/bumon.xg
+
+bumon.h: bumon.xg
+       ${RXGEN} -h -o $@ ${srcdir}/bumon.xg
+
+bumon.xdr.c: bumon.h
+bumon.ss.c: bumon.h
+bumon.cs.c: bumon.h
 
 butm_errs.c butm.h: butm_errs.et butm.p.h
        $(RM) -f butm.h butm_errs.c

diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
index 68929b2..21df796 100644 (file)
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@@ -95,8 +95,21 @@ server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c
 budb_server: $(SERVER_OBJS) ${LIBS}
        ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS}
 
-budb.xdr.c budb.cs.c budb.ss.c budb.h: budb.rg
-       ${RXGEN} ${srcdir}/budb.rg
+budb.cs.c: budb.rg
+       ${RXGEN} -C -o $@ ${srcdir}/budb.rg
+
+budb.ss.c: budb.rg
+       ${RXGEN} -S -o $@ ${srcdir}/budb.rg
+
+budb.xdr.c: budb.rg
+       ${RXGEN} -c -o $@ ${srcdir}/budb.rg
+
+budb.h: budb.rg
+       ${RXGEN} -h -o $@ ${srcdir}/budb.rg
+
+budb.cs.c: budb.h
+budb.xdr.c: budb.h
+budb.ss.c: budb.h
 
 libbudb.a: budb_errs.o budb.cs.o budb.xdr.o struct_ops.o AFS_component_version_number.o
        -$(RM) -f $@

diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in
index a521787..b59d090 100644 (file)
--- a/src/cmd/Makefile.in
+++ b/src/cmd/Makefile.in
@@ -41,10 +41,12 @@ all: ${TOP_LIBDIR}/libcmd.a ${TOP_INCDIR}/afs/cmd.h
 
 all64: all ${TOP_LIBDIR}/libcmd64.a
 
-cmd.h cmd_errors.c: cmd_errors.et cmd.p.h
+cmd.h: cmd_errors.et cmd.p.h
        $(RM) -f cmd.h cmd_errors.c
        ${COMPILE_ET} -p ${srcdir} cmd_errors -h cmd
 
+cmd_errors.c: cmd.h 
+
 cmd_errors.o: cmd_errors.c
 
 cmd.o: cmd.c cmd.h

diff --git a/src/dauth/Makefile.in b/src/dauth/Makefile.in
index c61efcc..c765b07 100644 (file)
--- a/src/dauth/Makefile.in
+++ b/src/dauth/Makefile.in
@@ -75,8 +75,15 @@ clean:
 
 adkint.cs.o:   adkint.cs.c
 adkint.xdr.o:  adkint.xdr.c adkint.h
-adkint.cs.c    adkint.xdr.c adkint.h: adkint.xg
-               ${RXGEN} ${srcdir}/adkint.xg
+
+adkint.cs.c: adkint.xg
+       ${RXGEN} -C -o $@ ${srcdir}/adkint.xg
+
+adkint.xdr.c: adkint.xg
+       ${RXGEN} -c -o $@ ${srcdir}/adkint.xg
+
+adkint.h: adkint.xg
+       ${RXGEN} -h -o $@ ${srcdir}/adkint.xg
 
 dlog:          dlog.o $(VERS) $(OBJS) $(LIBS)
                $(CC) ${LDFLAGS} -o dlog dlog.o $(VERS) $(OBJS) ${LIBS} \

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index b496226..5aeff8b 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -130,8 +130,23 @@ kauth.ss.o: kauth.ss.c
 kauth.cs.o: kauth.cs.c
 kauth.xdr.o: kauth.xdr.c kauth.h
 
-kauth.ss.c kauth.cs.c kauth.xdr.c kauth.h: kauth.rg
-       ${RXGEN} -x ${srcdir}/kauth.rg
+$(UKSRCS): kauth.h
+
+kauth.cs.c: kauth.rg
+       ${RXGEN} -x -C -o $@ ${srcdir}/kauth.rg
+
+kauth.ss.c: kauth.rg
+       ${RXGEN} -x -S -o $@ ${srcdir}/kauth.rg
+
+kauth.xdr.c: kauth.rg
+       ${RXGEN} -x -c -o $@ ${srcdir}/kauth.rg
+
+kauth.h: kauth.rg
+       ${RXGEN} -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
@@ -212,7 +227,7 @@ user.krb.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
 user.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
        ${CC} ${CFLAGS} -c ${srcdir}/user.c
 
-kdb: kdb.o ${INCLS}
+kdb: kdb.o ${INCLS} ${LIBS} ${XLIBS} libkauth.a
        ${CC} ${LDFLAGS} -o kdb kdb.o libkauth.a ${LIBS} ${XLIBS}
 
 kdb.o: kdb.c AFS_component_version_number.o

diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in
index 96701c6..8b765c6 100644 (file)
--- a/src/libafs/MakefileProto.AIX.in
+++ b/src/libafs/MakefileProto.AIX.in
@@ -94,17 +94,17 @@ include Makefile.common
 setup:
        -mkdir $(KOBJ)
        -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config
-       ln -s ../Makefile $(KOBJ)/Makefile
-       ln -s ../Makefile.common $(KOBJ)/Makefile.common
-       ln -s ../config $(KOBJ)/config
+       ln -fs ../Makefile $(KOBJ)/Makefile
+       ln -fs ../Makefile.common $(KOBJ)/Makefile.common
+       ln -fs ../config $(KOBJ)/config
        -$(RM) -f  h net netinet rpc ufs nfs  machine sys
-       ln -s /usr/include/sys h
-       ln -s /usr/include/net net
-       ln -s /usr/include/netinet netinet
-       ln -s /usr/include/rpc rpc
-       ln -s /usr/include/sys sys
-       ln -s /usr/include/nfs nfs
-       ln -s /usr/include/jfs ufs
+       ln -fs /usr/include/sys h
+       ln -fs /usr/include/net net
+       ln -fs /usr/include/netinet netinet
+       ln -fs /usr/include/rpc rpc
+       ln -fs /usr/include/sys sys
+       ln -fs /usr/include/nfs nfs
+       ln -fs /usr/include/jfs ufs
 
 
 # Standard AFS->NFS translator support is removed in AFS 3.5 in favor of

diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in
index d2a3975..e2bc64e 100644 (file)
--- a/src/libafs/MakefileProto.DARWIN.in
+++ b/src/libafs/MakefileProto.DARWIN.in
@@ -71,18 +71,18 @@ include Makefile.common
 setup:
        -mkdir $(KOBJ)
        -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config
-       ln -s ../Makefile $(KOBJ)/Makefile
-       ln -s ../Makefile.common $(KOBJ)/Makefile.common
-       ln -s ../config $(KOBJ)/config
+       ln -fs ../Makefile $(KOBJ)/Makefile
+       ln -fs ../Makefile.common $(KOBJ)/Makefile.common
+       ln -fs ../config $(KOBJ)/config
        -$(RM) -f  h net netinet rpc ufs nfs  machine sys vm mach kern
-       -ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/net net
-       -ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/machine machine
-       -ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/netinet netinet
-       -ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/nfs nfs
-       -ln -s /usr/include/rpc rpc
-       -ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/sys sys
-       -ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/ufs ufs
-       -ln -s $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/sys h
+       -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/net net
+       -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/machine machine
+       -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/netinet netinet
+       -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/nfs nfs
+       -ln -fs /usr/include/rpc rpc
+       -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/sys sys
+       -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/ufs ufs
+       -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/sys h
 
 
 # Below this line are targets when in the COMMON directory:

diff --git a/src/libafs/MakefileProto.DUX.in b/src/libafs/MakefileProto.DUX.in
index 951ac05..df61e30 100644 (file)
--- a/src/libafs/MakefileProto.DUX.in
+++ b/src/libafs/MakefileProto.DUX.in
@@ -75,19 +75,19 @@ include Makefile.common
 setup:
        -mkdir $(KOBJ)
        -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config
-       ln -s ../Makefile $(KOBJ)/Makefile
-       ln -s ../Makefile.common $(KOBJ)/Makefile.common
-       ln -s ../config $(KOBJ)/config
+       ln -fs ../Makefile $(KOBJ)/Makefile
+       ln -fs ../Makefile.common $(KOBJ)/Makefile.common
+       ln -fs ../config $(KOBJ)/config
        -$(RM) -f  h net netinet rpc ufs nfs  machine sys vm
-       -ln -s /usr/sys/include/net net
-       -ln -s /usr/sys/include/machine machine
-       -ln -s /usr/sys/include/netinet netinet
-       -ln -s /usr/sys/include/nfs nfs
-       -ln -s /usr/sys/include/rpc rpc
-       -ln -s /usr/sys/include/sys sys
-       -ln -s /usr/sys/include/ufs ufs
-       -ln -s /usr/sys/include/sys h
-       -ln -s /usr/sys/include/vm vm
+       -ln -fs /usr/sys/include/net net
+       -ln -fs /usr/sys/include/machine machine
+       -ln -fs /usr/sys/include/netinet netinet
+       -ln -fs /usr/sys/include/nfs nfs
+       -ln -fs /usr/sys/include/rpc rpc
+       -ln -fs /usr/sys/include/sys sys
+       -ln -fs /usr/sys/include/ufs ufs
+       -ln -fs /usr/sys/include/sys h
+       -ln -fs /usr/sys/include/vm vm
        -touch $(KOBJ)/sec_net.h
 
 

diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index 8648832..36b80a6 100644 (file)
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -70,19 +70,19 @@ include Makefile.common
 setup:
        -mkdir $(KOBJ)
        -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config
-       ln -s ../Makefile $(KOBJ)/Makefile
-       ln -s ../Makefile.common $(KOBJ)/Makefile.common
-       ln -s ../config $(KOBJ)/config
+       ln -fs ../Makefile $(KOBJ)/Makefile
+       ln -fs ../Makefile.common $(KOBJ)/Makefile.common
+       ln -fs ../config $(KOBJ)/config
        -$(RM) -f  h net netinet rpc ufs nfs  machine sys vm
-       -ln -s /usr/src/sys/net net
-       -ln -s /usr/src/sys/i386/include machine
-       -ln -s /usr/src/sys/netinet netinet
-       -ln -s /usr/src/sys/nfs nfs
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/src/sys/sys sys
-       -ln -s /usr/src/sys/ufs/ufs ufs
-       -ln -s /usr/src/sys/sys h
-       -ln -s /usr/src/sys/vm vm
+       -ln -fs /usr/src/sys/net net
+       -ln -fs /usr/src/sys/i386/include machine
+       -ln -fs /usr/src/sys/netinet netinet
+       -ln -fs /usr/src/sys/nfs nfs
+       -ln -fs /usr/include/rpc rpc
+       -ln -fs /usr/src/sys/sys sys
+       -ln -fs /usr/src/sys/ufs/ufs ufs
+       -ln -fs /usr/src/sys/sys h
+       -ln -fs /usr/src/sys/vm vm
        -touch $(KOBJ)/sec_net.h
 
 

diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in
index df9ae60..5192f67 100644 (file)
--- a/src/libafs/MakefileProto.HPUX.in
+++ b/src/libafs/MakefileProto.HPUX.in
@@ -98,25 +98,25 @@ BITS = 64 32
 
 setup:
        -$(RM) -f  h net dux machine netinet nfs rpc s200 ufs sys
-       ln -s /usr/include/sys h
-       ln -s /etc/conf/net net
-       ln -s /etc/conf/dux dux
-       ln -s /etc/conf/machine machine
-       ln -s /etc/conf/netinet netinet
-       ln -s /etc/conf/nfs nfs
-       ln -s /usr/include/rpc rpc
-       ln -s /etc/conf/machine s200
-       ln -s /etc/conf/ufs ufs
-       ln -s /usr/include/sys sys
+       ln -fs /usr/include/sys h
+       ln -fs /etc/conf/net net
+       ln -fs /etc/conf/dux dux
+       ln -fs /etc/conf/machine machine
+       ln -fs /etc/conf/netinet netinet
+       ln -fs /etc/conf/nfs nfs
+       ln -fs /usr/include/rpc rpc
+       ln -fs /etc/conf/machine s200
+       ln -fs /etc/conf/ufs ufs
+       ln -fs /usr/include/sys sys
        for b in $(BITS); do \
            for t in $(KOBJ); do \
                dir=$$t.$$b; \
                echo Making directory: $$dir; \
                mkdir -p $$dir; \
                $(RM) -f $$dir/Makefile $$dir/Makefile.common $$dir/config; \
-               ln -s ../Makefile $$dir/Makefile; \
-               ln -s ../Makefile.common $$dir/Makefile.common; \
-               ln -s ../config $$dir/config; \
+               ln -fs ../Makefile $$dir/Makefile; \
+               ln -fs ../Makefile.common $$dir/Makefile.common; \
+               ln -fs ../config $$dir/config; \
            done; \
        done
        echo Setup complete.

diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in
index 4ce84e0..1a2d859 100644 (file)
--- a/src/libafs/MakefileProto.IRIX.in
+++ b/src/libafs/MakefileProto.IRIX.in
@@ -242,10 +242,10 @@ KOBJ = STATIC MODLOAD
 
 setup:
        -$(RM) -f  h net netinet rpc ufs nfs  machine sys 
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net /usr/include/netinet .
-       -ln -s /usr/include/rpc /usr/include/sys .
-       -ln -s /usr/include/sys/fs .
+       -ln -fs /usr/include/sys h
+       -ln -fs /usr/include/net /usr/include/netinet .
+       -ln -fs /usr/include/rpc /usr/include/sys .
+       -ln -fs /usr/include/sys/fs .
 <all -sgi_65>
        BUILDPROCS="${PROCESSORS}" ; \
        BUILDMPS="${MPS}" ; \
@@ -260,9 +260,9 @@ setup:
                echo Making directory: $$dir; \
                mkdir -p $$dir; \
                $(RM) -f $$dir/Makefile.common $$dir/Makefile $$dir/config; \
-               ln -s ../Makefile.common $$dir/Makefile.common; \
-               ln -s ../Makefile $$dir/Makefile; \
-               ln -s ../config $$dir/config; \
+               ln -fs ../Makefile.common $$dir/Makefile.common; \
+               ln -fs ../Makefile $$dir/Makefile; \
+               ln -fs ../config $$dir/config; \
            done; \
          done; \
        done
@@ -277,9 +277,9 @@ setup:
                echo Making directory: $$dir; \
                mkdir -p $$dir; \
                $(RM) -f $$dir/Makefile.common $$dir/Makefile $$dir/config; \
-               ln -s ../Makefile.common $$dir/Makefile.common; \
-               ln -s ../Makefile $$dir/Makefile; \
-               ln -s ../config $$dir/config; \
+               ln -fs ../Makefile.common $$dir/Makefile.common; \
+               ln -fs ../Makefile $$dir/Makefile; \
+               ln -fs ../config $$dir/config; \
            done; \
        done
 <all>

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 12682e7..e853746 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -116,7 +116,7 @@ LOCAL_SMP_DEF=
 
 setup:
        -$(RM) -f h net netinet sys rpc
-       -ln -s rx rpc
+       -ln -fs rx rpc
        for m in ${MPS} ; do \
                KDIR=$(KOBJ)-${LINUX_VERS}${LINUX_MODULE_NAME}-$$m; \
                mkdir -p $${KDIR}; \
@@ -129,32 +129,32 @@ setup:
 
 ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
        $(RM) -f h 
-       ln -s ${LINUX_KERNEL_PATH}/include/linux h 
+       ln -fs ${LINUX_KERNEL_PATH}/include/linux h 
        $(RM) -f linux 
-       ln -s ${LINUX_KERNEL_PATH}/include/linux linux 
+       ln -fs ${LINUX_KERNEL_PATH}/include/linux linux 
        $(RM) -f net 
-       ln -s ${LINUX_KERNEL_PATH}/include/linux net 
+       ln -fs ${LINUX_KERNEL_PATH}/include/linux net 
        $(RM) -f netinet 
-       ln -s ${LINUX_KERNEL_PATH}/include/linux netinet 
+       ln -fs ${LINUX_KERNEL_PATH}/include/linux netinet 
        $(RM) -f sys
-       ln -s ${LINUX_KERNEL_PATH}/include/linux sys
+       ln -fs ${LINUX_KERNEL_PATH}/include/linux sys
        $(RM) -f asm-generic
-       ln -s ${LINUX_KERNEL_PATH}/include/asm-generic asm-generic
+       ln -fs ${LINUX_KERNEL_PATH}/include/asm-generic asm-generic
        $(RM) -f asm
 <alpha_linux_22 alpha_linux_24>
-       ln -s ${LINUX_KERNEL_PATH}/include/asm-alpha asm
+       ln -fs ${LINUX_KERNEL_PATH}/include/asm-alpha asm
 <i386_linux22 i386_linux24>
-       ln -s ${LINUX_KERNEL_PATH}/include/asm-i386 asm
+       ln -fs ${LINUX_KERNEL_PATH}/include/asm-i386 asm
 <s390_linux22 s390_linux24>
-       ln -s ${LINUX_KERNEL_PATH}/include/asm-s390 asm
+       ln -fs ${LINUX_KERNEL_PATH}/include/asm-s390 asm
 <ppc_linux22 ppc_linux24>
-       ln -s ${LINUX_KERNEL_PATH}/include/asm-ppc asm 
+       ln -fs ${LINUX_KERNEL_PATH}/include/asm-ppc asm 
 <sparc_linux22 sparc_linux24>
-       ln -s ${LINUX_KERNEL_PATH}/include/asm-sparc asm
+       ln -fs ${LINUX_KERNEL_PATH}/include/asm-sparc asm
 <sparc64_linux22 sparc64_linux24>
-       ln -s ${LINUX_KERNEL_PATH}/include/asm-sparc64 asm
+       ln -fs ${LINUX_KERNEL_PATH}/include/asm-sparc64 asm
 <ia64_linux24>
-       ln -s ${LINUX_KERNEL_PATH}/include/asm-ia64 asm
+       ln -fs ${LINUX_KERNEL_PATH}/include/asm-ia64 asm
 <all>
        for m in ${MPS} ; do \
                KDIR=${KOBJ}-${LINUX_VERS}${LINUX_MODULE_NAME}-$$m ; \

diff --git a/src/libafs/MakefileProto.OBSD.in b/src/libafs/MakefileProto.OBSD.in
index a21f51c..d5ba90d 100644 (file)
--- a/src/libafs/MakefileProto.OBSD.in
+++ b/src/libafs/MakefileProto.OBSD.in
@@ -70,19 +70,19 @@ include Makefile.common
 setup:
        -mkdir $(KOBJ)
        -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config
-       ln -s ../Makefile $(KOBJ)/Makefile
-       ln -s ../Makefile.common $(KOBJ)/Makefile.common
-       ln -s ../config $(KOBJ)/config
+       ln -fs ../Makefile $(KOBJ)/Makefile
+       ln -fs ../Makefile.common $(KOBJ)/Makefile.common
+       ln -fs ../config $(KOBJ)/config
        -$(RM) -f  h net netinet rpc ufs nfs  machine sys vm
-       -ln -s /usr/src/sys/net net
-       -ln -s /usr/src/sys/i386/include machine
-       -ln -s /usr/src/sys/netinet netinet
-       -ln -s /usr/src/sys/nfs nfs
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/src/sys/sys sys
-       -ln -s /usr/src/sys/ufs/ufs ufs
-       -ln -s /usr/src/sys/sys h
-       -ln -s /usr/src/sys/vm vm
+       -ln -fs /usr/src/sys/net net
+       -ln -fs /usr/src/sys/i386/include machine
+       -ln -fs /usr/src/sys/netinet netinet
+       -ln -fs /usr/src/sys/nfs nfs
+       -ln -fs /usr/include/rpc rpc
+       -ln -fs /usr/src/sys/sys sys
+       -ln -fs /usr/src/sys/ufs/ufs ufs
+       -ln -fs /usr/src/sys/sys h
+       -ln -fs /usr/src/sys/vm vm
        -touch $(KOBJ)/sec_net.h
 
 

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index 471e398..e67312d 100644 (file)
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -86,21 +86,21 @@ include Makefile.common
 
 setup:
        -$(RM) -f  h net netinet rpc ufs nfs  machine sys inet
-       -ln -s /usr/include/sys h
-       -ln -s /usr/include/net net
-       -ln -s /usr/include/netinet netinet
-       -ln -s /usr/include/rpc rpc
-       -ln -s /usr/include/sys sys
-       -ln -s /usr/include/nfs nfs
-       -ln -s /usr/include/inet inet
-       -ln -s /usr/include/ufs ufs
+       -ln -fs /usr/include/sys h
+       -ln -fs /usr/include/net net
+       -ln -fs /usr/include/netinet netinet
+       -ln -fs /usr/include/rpc rpc
+       -ln -fs /usr/include/sys sys
+       -ln -fs /usr/include/nfs nfs
+       -ln -fs /usr/include/inet inet
+       -ln -fs /usr/include/ufs ufs
        for t in ${KOBJ} ; do \
                echo Making directory: $$t; \
                mkdir -p $$t; \
                $(RM) -f $$t/Makefile.common $$t/Makefile $$t/config ; \
-               ln -s ../Makefile.common $$t/Makefile.common ; \
-               ln -s ../Makefile $$t/Makefile ;\
-               ln -s ../config $$t/config ;\
+               ln -fs ../Makefile.common $$t/Makefile.common ; \
+               ln -fs ../Makefile $$t/Makefile ;\
+               ln -fs ../config $$t/config ;\
        done
 
 

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index 750b9b4..67f43ac 100644 (file)
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -83,8 +83,21 @@ ptint.ss.o: ptint.ss.c ptint.xdr.c ptint.xg
 ptint.cs.o: ptint.cs.c ptint.xdr.c ptint.xg
 ptint.xdr.o: ptint.xdr.c ptint.h ptint.xg
 
-ptint.ss.c ptint.cs.c ptint.xdr.c ptint.h: ptint.xg
-       ${RXGEN} -x ${srcdir}/ptint.xg
+ptint.cs.c: ptint.xg
+       ${RXGEN} -x -C -o $@ ${srcdir}/ptint.xg
+
+ptint.ss.c: ptint.xg
+       ${RXGEN} -x -S -o $@ ${srcdir}/ptint.xg
+
+ptint.xdr.c: ptint.xg
+       ${RXGEN} -x -c -o $@ ${srcdir}/ptint.xg
+
+ptint.h: ptint.xg
+       ${RXGEN} -x -h -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

diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in
index 2530f0f..ae1b72d 100644 (file)
--- a/src/rx/Makefile.in
+++ b/src/rx/Makefile.in
@@ -242,7 +242,6 @@ ukinstall: \
        ${UKERNELDIR}/rx/rx.h \
        ${UKERNELDIR}/rx/rx_kcommon.c \
        ${UKERNELDIR}/rx/rx_kcommon.h \
-       ${UKERNELDIR}/rx/rx_kcommon.h \
        ${UKERNELDIR}/rx/rx_kernel.h \
        ${UKERNELDIR}/rx/rx_kmutex.h \
        ${UKERNELDIR}/rx/rx_knet.c \

diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in
index de7c324..97f1fda 100644 (file)
--- a/src/rxstat/Makefile.in
+++ b/src/rxstat/Makefile.in
@@ -44,8 +44,21 @@ all: kinstall ukinstall ${TOP_INCDIR}/rx/rxstat.h ${TOP_LIBDIR}/librxstat.a
 #
 # Build targets
 #
-rxstat.cs.c rxstat.ss.c rxstat.xdr.c rxstat.h: rxstat.xg
-       ${RXGEN} -x ${srcdir}/rxstat.xg
+rxstat.cs.c: rxstat.xg
+       ${RXGEN} -x -C -o $@ ${srcdir}/rxstat.xg
+
+rxstat.ss.c: rxstat.xg
+       ${RXGEN} -x -S -o $@ ${srcdir}/rxstat.xg
+
+rxstat.xdr.c: rxstat.xg
+       ${RXGEN} -x -c -o $@ ${srcdir}/rxstat.xg
+
+rxstat.h: rxstat.xg
+       ${RXGEN} -x -h -o $@ ${srcdir}/rxstat.xg
+
+rxstat.xdr.c: rxstat.h
+rxstat.cs.c: rxstat.h
+rxstat.ss.c: rxstat.h
 
 librxstat.a: ${LIBOBJS} AFS_component_version_number.o
        -$(RM) -f $@

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index a474f22..7acb0fe 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -93,8 +93,17 @@ afssyscalls.o: afssyscalls.c afssyscalls.h
 rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h
 rmtsysd: AFS_component_version_number.o
 
-rmtsys.cs.c rmtsys.ss.c rmtsys.xdr.c rmtsys.h: rmtsys.xg
-       ${RXGEN} ${srcdir}/rmtsys.xg
+rmtsys.cs.c: rmtsys.xg
+       ${RXGEN} -C -o $@ ${srcdir}/rmtsys.xg
+       
+rmtsys.ss.c: rmtsys.xg
+       ${RXGEN} -S -o $@ ${srcdir}/rmtsys.xg
+       
+rmtsys.xdr.c: rmtsys.xg
+       ${RXGEN} -c -o $@ ${srcdir}/rmtsys.xg
+       
+rmtsys.h: rmtsys.xg
+       ${RXGEN} -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 1139b3a..582287e 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -58,8 +58,21 @@ utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik.a
 udebug: udebug.o libubik.a 
        ${CC} ${CFLAGS} -o udebug udebug.o libubik.a $(LIBS)
 
-ubik_int.ss.c ubik_int.cs.c ubik_int.xdr.c ubik_int.h: ubik_int.xg
-       ${RXGEN} -x ${srcdir}/ubik_int.xg
+ubik_int.cs.c: ubik_int.xg
+       ${RXGEN} -x -C -o $@ ${srcdir}/ubik_int.xg
+
+ubik_int.ss.c: ubik_int.xg
+       ${RXGEN} -x -S -o $@ ${srcdir}/ubik_int.xg
+
+ubik_int.xdr.c: ubik_int.xg
+       ${RXGEN} -x -c -o $@ ${srcdir}/ubik_int.xg
+
+ubik_int.h: ubik_int.xg
+       ${RXGEN} -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: ubik_int.xg Kubik_int.h
        ${RXGEN} -x -k -C -o Kubik_int.cs.c ${srcdir}/ubik_int.xg
@@ -73,8 +86,22 @@ Kubik_int.h: 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.ss.c utst_int.cs.c utst_int.xdr.c utst_int.h: utst_int.xg
-       ${RXGEN} ${srcdir}/utst_int.xg
+
+utst_int.cs.c: utst_int.xg
+       ${RXGEN} -C -o $@ ${srcdir}/utst_int.xg
+
+utst_int.ss.c: utst_int.xg
+       ${RXGEN} -S -o $@ ${srcdir}/utst_int.xg
+
+utst_int.xdr.c: utst_int.xg
+       ${RXGEN} -c -o $@ ${srcdir}/utst_int.xg
+
+utst_int.h: utst_int.xg
+       ${RXGEN} -h -o $@ ${srcdir}/utst_int.xg
+
+utst_int.cs.c: utst_int.h
+utst_int.ss.c: utst_int.h
+utst_int.xdr.c: utst_int.h
 
 utst_server.o: utst_server.c ${INCLS} utst_int.h AFS_component_version_number.c
 utst_client.o: utst_client.c ${INCLS} utst_int.h AFS_component_version_number.c

diff --git a/src/update/Makefile.in b/src/update/Makefile.in
index 40cff1b..47c524b 100644 (file)
--- a/src/update/Makefile.in
+++ b/src/update/Makefile.in
@@ -58,8 +58,21 @@ 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.ss.c update.er.c update.h: update.xg
-       ${RXGEN} ${srcdir}/update.xg
+update.cs.c: update.xg
+       ${RXGEN} -C -o $@ ${srcdir}/update.xg
+
+update.ss.c: update.xg
+       ${RXGEN} -S -o $@ ${srcdir}/update.xg
+
+update.xdr.c: update.xg
+       ${RXGEN} -c -o $@ ${srcdir}/update.xg
+
+update.h: update.xg
+       ${RXGEN} -h -o $@ ${srcdir}/update.xg
+
+update.cs.c: update.h
+upcate.ss.c: update.h
+update.er.c: update.h
 
 #
 # Installation targets

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 17112bc..a3b8c15 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -97,7 +97,7 @@ casestrcpy.o: ${srcdir}/casestrcpy.c
 hputil.o: ${srcdir}/hputil.c
        ${CC} ${CFLAGS} -c ${srcdir}/hputil.c
 
-flipbase64.o: ${srcdir}/flipbase64.c
+flipbase64.o: ${srcdir}/flipbase64.c ${TOP_INCDIR}/afs/dirpath.h
        ${CC} ${CFLAGS} -c ${srcdir}/flipbase64.c
 
 volparse.o: ${srcdir}/volparse.c
@@ -109,19 +109,19 @@ snprintf.o: ${srcdir}/snprintf.c
 base64.o: ${srcdir}/base64.c
        ${CC} ${CFLAGS} -c ${srcdir}/base64.c
 
-hostparse.o: ${srcdir}/hostparse.c ${srcdir}/afsutil.h
+hostparse.o: ${srcdir}/hostparse.c ${srcdir}/afsutil.h ${TOP_INCDIR}/afs/dirpath.h
        ${CC} ${CFLAGS} -c ${srcdir}/hostparse.c
 
-ktime.o: ${srcdir}/ktime.c
+ktime.o: ${srcdir}/ktime.c ${TOP_INCDIR}/afs/dirpath.h
        ${CC} ${CFLAGS} -c ${srcdir}/ktime.c
 
-kreltime.o: ${srcdir}/kreltime.c
+kreltime.o: ${srcdir}/kreltime.c ${TOP_INCDIR}/afs/dirpath.h
        ${CC} ${CFLAGS} -c ${srcdir}/kreltime.c
 
-get_krbrlm.o: ${srcdir}/get_krbrlm.c
+get_krbrlm.o: ${srcdir}/get_krbrlm.c ${TOP_INCDIR}/afs/dirpath.h
        ${CC} ${CFLAGS} -c ${srcdir}/get_krbrlm.c
 
-uuid.o: ${srcdir}/uuid.c
+uuid.o: ${srcdir}/uuid.c ${TOP_INCDIR}/afs/dirpath.h
        ${CC} ${CFLAGS} -c ${srcdir}/uuid.c
 
 sys.o: ${srcdir}/sys.c ${TOP_INCDIR}/afs/param.h AFS_component_version_number.c
@@ -133,10 +133,10 @@ sys: sys.o
 isathing.o: ${srcdir}/isathing.c
        ${CC} ${CFLAGS} -c ${srcdir}/isathing.c
 
-serverLog.o: ${srcdir}/serverLog.c
+serverLog.o: ${srcdir}/serverLog.c ${TOP_INCDIR}/afs/dirpath.h
        ${CC} ${CFLAGS} -c ${srcdir}/serverLog.c
 
-dirpath.o: ${srcdir}/dirpath.c dirpath.h
+dirpath.o: ${srcdir}/dirpath.c ${TOP_INCDIR}/afs/dirpath.h
        ${CC} ${CFLAGS} -c ${srcdir}/dirpath.c
 
 fileutil.o: ${srcdir}/fileutil.c ${srcdir}/fileutil.h

diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
index 239d4a5..ac1b006 100644 (file)
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@@ -110,11 +110,26 @@ vlprocs.o: vlprocs.c ${INCLS}
 vldbint.ss.o: vldbint.ss.c vldbint.xdr.c
 vldbint.cs.o: vldbint.cs.c vldbint.xdr.c
 vldbint.xdr.o: vldbint.xdr.c vldbint.h
-vldbint.ss.c vldbint.cs.c vldbint.xdr.c vldbint.h: vldbint.xg
-       ${RXGEN} -x ${srcdir}/vldbint.xg
+
+vldbint.cs.c: vldbint.xg
+       ${RXGEN} -x -C -o $@ ${srcdir}/vldbint.xg
+
+vldbint.ss.c: vldbint.xg
+       ${RXGEN} -x -S -o $@ ${srcdir}/vldbint.xg
+
+vldbint.xdr.c: vldbint.xg
+       ${RXGEN} -x -c -o $@ ${srcdir}/vldbint.xg
+
+vldbint.h: vldbint.xg
+       ${RXGEN} -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
+
 Kvldbint.xdr.c: vldbint.xg
        ${RXGEN} -x -k -c -o $@ ${srcdir}/vldbint.xg
 

diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
index d707fa7..012ddcb 100644 (file)
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@@ -173,7 +173,7 @@ listinodes.o: listinodes.c AFS_component_version_number.c
                                ;;                      \
        esac
 
-gi: ${TOP_LIBDIR}/libsys.a
+gi: ${TOP_LIBDIR}/libsys.a 
        case ${SYS_NAME} in \
                 *linux* | sgi_* | *fbsd* ) \
                        echo "Don't build gi on ${SYS_NAME}";; \
@@ -182,7 +182,7 @@ gi: ${TOP_LIBDIR}/libsys.a
                        ${CC} ${LDFLAGS} -o gi gi.o ${TOP_LIBDIR}/libsys.a;; \
         esac
 
-volinfo: vol-info.o physio.o ihandle.o
+volinfo: vol-info.o physio.o ihandle.o ${LIBS}
        case ${SYS_NAME} in \
                *linux* | *fbsd*) \
                        ${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index e52a558..8d59b7f 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -96,8 +96,21 @@ volser.h volerr.c: volerr.et volser.p.h
        $(RM) -f volser.h volerr.c
        ${COMPILE_ET} -p ${srcdir} volerr -h volser
 
-volint.h volint.ss.c volint.cs.c volint.xdr.c: volint.xg
-       ${RXGEN} -x ${srcdir}/volint.xg
+volint.cs.c: volint.xg
+       ${RXGEN} -x -C -o $@ ${srcdir}/volint.xg
+
+volint.ss.c: volint.xg
+       ${RXGEN} -x -S -o $@ ${srcdir}/volint.xg
+
+volint.xdr.c: volint.xg
+       ${RXGEN} -x -c -o $@ ${srcdir}/volint.xg
+
+volint.h: volint.xg
+       ${RXGEN} -x -h -o $@ ${srcdir}/volint.xg
+
+volint.cs.c: volint.h
+volint.ss.c: volint.h
+volint.xdr.c: volint.h
 
 #
 # Dependencies