Patch #: 38 Type: operational change Priority: none Modification: cleanup various makefiles Submitted: Dieter Braun Submitted: John J. Chew Submitted: John Sellens Submitted: David N. Blank Submitted: William Roberts Archived: munnari.OZ.AU mac/cap.patches/cap60.patch038 Application: 'cd cap60; patch -p < cap60.patches/cap60.patch038' File: cap60/support/ethertalk/Makefile.m4 File: cap60/support/uab/Makefile.m4 File: cap60/man/makefile File: cap60/netat/Makefile.m4 File: cap60/contrib/Makefile.m4 File: cap60/gen.makes *** support/ethertalk/Makefile.m4.orig Mon Jul 1 19:08:33 1991 --- support/ethertalk/Makefile.m4 Sat Jul 27 20:58:48 1991 *************** *** 17,32 **** ld -r -o abetalk.o ${LIBABOBJS} ${POBJS} aarpd_clnt.o aarpd_xdr.o aarpd: aarpd.o aarpd_svc.o aarpd.h ! cc -o aarpd aarpd.o aarpd_svc.o ${CAPLIB} aarptest: aarptest.o aarpd.h ! cc -o aarptest aarptest.o ${CAPLIB} rtmptest: rtmptest.o aarpd.h ! cc -o rtmptest rtmptest.o ${CAPLIB} rangetest: rangetest.o aarpd.h ! cc -o rangetest rangetest.o ${CAPLIB} aarpd.o: aarpd.c aarpd.h --- 17,32 ---- ld -r -o abetalk.o ${LIBABOBJS} ${POBJS} aarpd_clnt.o aarpd_xdr.o aarpd: aarpd.o aarpd_svc.o aarpd.h ! ${CC} ${LFLAGS} -o aarpd aarpd.o aarpd_svc.o ${CAPLIB} aarptest: aarptest.o aarpd.h ! ${CC} ${LFLAGS} -o aarptest aarptest.o ${CAPLIB} rtmptest: rtmptest.o aarpd.h ! ${CC} ${LFLAGS} -o rtmptest rtmptest.o ${CAPLIB} rangetest: rangetest.o aarpd.h ! ${CC} ${LFLAGS} -o rangetest rangetest.o ${CAPLIB} aarpd.o: aarpd.c aarpd.h *************** *** 48,57 **** aarp.o: ../uab/aarp.c ../uab/hash.h ../uab/proto_intf.h \ ../uab/ethertalk.h ../uab/aarp_defs.h ../uab/aarp.h ! cc $(CFLAGS) -DAARPD -c ../uab/aarp.c hash.o: ../uab/hash.c ../uab/hash.h ! cc $(CFLAGS) -c ../uab/hash.c aarptest.o: aarptest.c aarpd.h --- 48,57 ---- aarp.o: ../uab/aarp.c ../uab/hash.h ../uab/proto_intf.h \ ../uab/ethertalk.h ../uab/aarp_defs.h ../uab/aarp.h ! ${CC} $(CFLAGS) -DAARPD -c ../uab/aarp.c hash.o: ../uab/hash.c ../uab/hash.h ! ${CC} $(CFLAGS) -c ../uab/hash.c aarptest.o: aarptest.c aarpd.h *** support/uab/Makefile.m4.orig Thu May 9 21:39:01 1991 --- support/uab/Makefile.m4 Sat Jul 27 21:00:19 1991 *************** *** 25,34 **** [${INSTALLER} uab ${DESTDIR}]) kip_mpx.o: kip_mpx.c mpxddp.h gw.h node.h ddpport.h ! cc -c ${CFLAGS} -DTAB=etalklocal() -DMTAB=etalklocal() kip_mpx.c uab.o: uab.c mpxddp.h gw.h node.h ddpport.h if_desc.h ! cc -c ${CFLAGS} -DUAB_PIDFILE=uabpidfile() \ -DBRIDGE_DESC=uabbrdescr() uab.c lint: --- 25,34 ---- [${INSTALLER} uab ${DESTDIR}]) kip_mpx.o: kip_mpx.c mpxddp.h gw.h node.h ddpport.h ! ${CC} -c ${CFLAGS} -DTAB=etalklocal() -DMTAB=etalklocal() kip_mpx.c uab.o: uab.c mpxddp.h gw.h node.h ddpport.h if_desc.h ! ${CC} -c ${CFLAGS} -DUAB_PIDFILE=uabpidfile() \ -DBRIDGE_DESC=uabbrdescr() uab.c lint: *** man/makefile.orig Thu Feb 28 23:42:50 1991 --- man/makefile Sat Jul 27 21:02:17 1991 *************** *** 23,32 **** --- 23,34 ---- txt: nroff -man CAP.3 > text/CAP.3 nroff -man CAP.8 > text/CAP.8 + nroff -man UAB.8 > text/UAB.8 nroff -man AUFS.1 > text/AUFS.1 nroff -man AUFS.8 > text/AUFS.8 nroff -man ash.1 > text/ash.1 nroff -man atalk.local.5 > text/atalk.local.5 + nroff -man etalk.local.5 > text/etalk.local.5 nroff -man atis.8 > text/atis.8 nroff -man atlook.1 > text/atlook.1 nroff -man atprint.1 > text/atprint.1 *** netat/Makefile.m4.orig Sat Jul 27 21:04:15 1991 --- netat/Makefile.m4 Sat Jul 27 21:04:53 1991 *************** *** 0 **** --- 1,12 ---- + I=includedir() + HFILES = aberrors.h abqueue.h appletalk.h afp.h afpcmd.h afpc.h \ + compat.h sysvcompat.h macfile.h abnbp.h + + install: $(HFILES) + -mkdir $I/netat + cp $(HFILES) $I/netat + + dist: + @cat todist + + clean: *** gen.makes.orig Thu Feb 28 23:45:49 1991 --- gen.makes Sat Jul 27 21:06:45 1991 *************** *** 5,11 **** appdirs="applications applications/aufs applications/papif applications/lwsrv" supportdirs="support/uab support/ethertalk" libdirs="lib lib/afp lib/afpc lib/cap" ! dirs="contrib samples extras etc ${libdirs} ${appdirs} ${supportdirs}" m4setup=`pwd`/m4.setup m4features=`pwd`/m4.features output=makefile --- 5,11 ---- appdirs="applications applications/aufs applications/papif applications/lwsrv" supportdirs="support/uab support/ethertalk" libdirs="lib lib/afp lib/afpc lib/cap" ! dirs="netat contrib samples extras etc ${libdirs} ${appdirs} ${supportdirs}" m4setup=`pwd`/m4.setup m4features=`pwd`/m4.features output=makefile *************** *** 32,37 **** for i in ${dirs} do echo Creating ${output} for $i ! (cd $i; m4 ${m4features} ${m4setup} Makefile.m4 | \ sed -e "1,/##########MARKER##########/d" > ${output}) done --- 32,37 ---- for i in ${dirs} do echo Creating ${output} for $i ! (cd $i; /bin/rm ${output}; m4 ${m4features} ${m4setup} Makefile.m4 | \ sed -e "1,/##########MARKER##########/d" > ${output}) done *** contrib/Makefile.m4.orig Wed Mar 13 21:42:18 1991 --- contrib/Makefile.m4 Sat Jul 27 21:08:30 1991 *************** *** 9,18 **** SLIB=libspecial() CAPLIB=libcap() ! DESTDIR=capdestdir() RENAMEFLAG=-DLWRENAMEFILE=lwrenamefile() ! PROGS=snitch cvt2apple cvt2cap lwrename printqueue all: ${PROGS} --- 9,21 ---- SLIB=libspecial() CAPLIB=libcap() ! UDESTDIR=capdestdir() ! SDESTDIR=capsrvrdestdir() RENAMEFLAG=-DLWRENAMEFILE=lwrenamefile() ! SRVR=snitch lwrename printqueue ! USER=cvt2apple cvt2cap ! PROGS= ${SRVR} ${USER} all: ${PROGS} *************** *** 39,46 **** install: ${PROGS} -strip ${PROGS} ! ifdef([sysvinstall],[install -f ${DESTDIR} ${PROGS}], ! [${INSTALLER} ${PROGS} ${DESTDIR}]) clean: -rm -f ${PROGS} *.o core make.log err att_getopt.c *~ --- 42,51 ---- install: ${PROGS} -strip ${PROGS} ! ifdef([sysvinstall],[install -f ${UDESTDIR} ${USER}], ! [${INSTALLER} ${USER} ${UDESTDIR}]) ! ifdef([sysvinstall],[install -f ${SDESTDIR} ${SRVR}], ! [${INSTALLER} ${SRVR} ${SDESTDIR}]) clean: -rm -f ${PROGS} *.o core make.log err att_getopt.c *~ *** README.orig Sat Jul 27 20:55:15 1991 --- README Sat Jul 27 20:55:26 1991 *************** *** 3,9 **** (For use with AppleTalk/Ethernet bridge) o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 37, July 1991 Introduction ------------ --- 3,9 ---- (For use with AppleTalk/Ethernet bridge) o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 38, July 1991 Introduction ------------