makefile-updates-20010828
authorNathan Neulinger <nneul@umr.edu>
Wed, 29 Aug 2001 02:19:55 +0000 (02:19 +0000)
committerDerrick Brashear <shadow@dementia.org>
Wed, 29 Aug 2001 02:19:55 +0000 (02:19 +0000)
clean up all the makefiles to remove bogus targets, eliminate trailing /
requirement from DESTDIR, avoid needing to pass things like DESTDIR around
between makefiles

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

remove bogus quoting

101 files changed:
Makefile.in
configure.in
src/afs/Makefile.in
src/afsd/Makefile.in
src/afsmonitor/Makefile.in
src/afsweb/Makefile.in
src/audit/Makefile.in
src/auth/Makefile.in
src/auth/test/Makefile.in
src/bozo/Makefile.in
src/bozo/test/Makefile.in
src/bu_utils/Makefile.in
src/bubasics/Makefile.in
src/bucoord/Makefile.in
src/budb/Makefile.in
src/butc/Makefile.in
src/butm/Makefile.in
src/cmd/Makefile.in
src/cmd/test/Makefile.in
src/comerr/Makefile.in
src/comerr/test/Makefile.in
src/config/Makefile.alpha_linux_22.in
src/config/Makefile.i386_djgpp
src/config/Makefile.i386_fbsd_42.in
src/config/Makefile.i386_linux22.in
src/config/Makefile.i386_linux24.in
src/config/Makefile.ppc_linux22.in
src/config/Makefile.ppc_linux24.in
src/config/Makefile.s390_linux22.in
src/config/Makefile.s390_linux24.in
src/config/Makefile.sparc64_linux22.in
src/config/Makefile.sparc64_linux24.in
src/config/Makefile.sparc_linux22.in
src/config/Makefile.version-NOCML.in
src/dauth/Makefile.in
src/des/Makefile.in
src/des/main.c [new file with mode: 0644]
src/des/misc.c
src/des/test/Makefile.in
src/des_stub/Makefile.in
src/dir/Makefile.in
src/dir/test/Makefile.in
src/export/Makefile.in
src/finale/Makefile.in
src/fsint/Makefile.in
src/fsprobe/Makefile.in
src/ftpd43+/Makefile.in
src/gtx/Makefile.in
src/inetd/Makefile.in
src/kauth/Makefile.in
src/kauth/test/Makefile.in
src/libacl/Makefile.in
src/libacl/test/Makefile.in
src/libadmin/Makefile.in
src/libafs/MakefileProto.AIX.in
src/libafsauthent/Makefile.in
src/libafsrpc/Makefile.in
src/log/Makefile.in
src/log/test/Makefile.in
src/login/Makefile.in
src/lwp/Makefile.in
src/ntp/Makefile.in
src/null/Makefile.in
src/package/Makefile.in
src/pam/Makefile.in
src/pinstall/Makefile.in
src/procmgmt/Makefile.in
src/ptserver/Makefile.in
src/rcp/Makefile.in
src/rlogind/Makefile.in
src/rsh/Makefile.in
src/rx/Makefile.in
src/rx/bulk.example/Makefile.in
src/rx/bulktest/Makefile.in
src/rx/multi.example/Makefile.in
src/rx/simple.example/Makefile.in
src/rx/test/Makefile.in
src/rxgen/Makefile.in
src/rxkad/Makefile.in
src/rxkad/test/Makefile.in
src/rxstat/Makefile.in
src/scout/Makefile.in
src/sgistuff/Makefile.in
src/sys/Makefile.in
src/tbutc/Makefile.in
src/tsm41/Makefile.in
src/tviced/Makefile.in
src/ubik/Makefile.in
src/update/Makefile.in
src/usd/Makefile.in
src/uss/Makefile.in
src/util/Makefile.in
src/venus/Makefile.in
src/venus/test/Makefile.in
src/vfsck/Makefile.in
src/viced/Makefile.in
src/vlserver/Makefile.in
src/vol/Makefile.in
src/vol/test/Makefile.in
src/volser/Makefile.in
src/xstat/Makefile.in

index 19b8f48..d6416d1 100644 (file)
@@ -9,9 +9,7 @@ SHELL=/bin/sh
 DESTDIR=@DESTDIR@
 SRCDIR=@SRCDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
-INSTALL=${SRCDIR}bin/install
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+INSTALL=${SRCDIR}/bin/install
 
 # Systype-generic items
 SYS_NAME=@AFS_SYSNAME@
@@ -43,16 +41,16 @@ COMPILE_PART2=; $(MAKE) install
 COMPILE_PART3=; $(MAKE) test
 COMPILE_CLEAN=; $(MAKE) clean
 
-all: force
-       set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
+all: force ${SYS_NAME}/dest
        $(MAKE) install
 
-all_nolibafs:
-       set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
+${SYS_NAME}/dest:
+       mkdir -p ${SYS_NAME}/dest
+
+all_nolibafs: ${SYS_NAME}/dest
        $(MAKE) install TARGET=finale_nolibafs
 
-only_libafs:
-       set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
+only_libafs: ${SYS_NAME}/dest
        $(MAKE) install TARGET=libafs
 
 project: cmd comerr 
@@ -204,12 +202,12 @@ null: project
 gtx: project null auth # kauth rxkad ?
        case ${SYS_NAME} in \
          rs_aix* | sun4x_5? | sgi_6? | *linux* | ppc_darwin* | *fbsd*) \
-               rm -f ${DESTDIR}lib/afs/libtermlib.a; \
-               ln -s libnull.a ${DESTDIR}lib/afs/libtermlib.a; \
+               rm -f ${DESTDIR}/lib/afs/libtermlib.a; \
+               ln -s libnull.a ${DESTDIR}/lib/afs/libtermlib.a; \
                ${COMPILE_PART1} gtx ${COMPILE_PART2};; \
          *) \
-               rm -f ${DESTDIR}lib/afs/libtermlib.a; \
-               ln -s /usr/lib/libtermlib.a ${DESTDIR}lib/afs/libtermlib.a; \
+               rm -f ${DESTDIR}/lib/afs/libtermlib.a; \
+               ln -s /usr/lib/libtermlib.a ${DESTDIR}/lib/afs/libtermlib.a; \
                ${COMPILE_PART1} gtx ${COMPILE_PART2};; \
        esac
 
@@ -508,10 +506,119 @@ clean2:
 
  
 distclean: clean
-       /bin/rm -f config.log config.cache config.status Makefile
-       /bin/rm -f src/config/afsconfig.h src/config/Makefile.${SYS_NAME} 
-       /bin/rm -f src/libafs/Makefile src/libafs/MakefileProto.${MKAFS_OSTYPE}
-       /bin/rm -f src/libuafs/Makefile afs.ppc_darwin.plist src/pam/Makefile
+       /bin/rm -f config.log config.cache config.status \
+       src/config/afsconfig.h \
+       Makefile \
+       src/afs/Makefile \
+       src/afsd/Makefile \
+       src/afsd/afs.ppc_darwin.plist \
+       src/afsmonitor/Makefile \
+       src/afsweb/Makefile \
+       src/audit/Makefile \
+       src/auth/test/Makefile \
+       src/auth/Makefile \
+       src/bozo/test/Makefile \
+       src/bozo/Makefile \
+       src/bu_utils/Makefile \
+       src/bubasics/Makefile \
+       src/bucoord/Makefile \
+       src/budb/Makefile \
+       src/butc/Makefile \
+       src/butm/Makefile \
+       src/cmd/test/Makefile \
+       src/cmd/Makefile \
+       src/comerr/test/Makefile \
+       src/comerr/Makefile \
+       src/config/Makefile \
+       src/config/Makefile.version \
+       src/config/Makefile.version-NOCML \
+       src/config/Makefile.${SYS_NAME} \
+       src/dauth/Makefile \
+       src/des/test/Makefile \
+       src/des/Makefile \
+       src/des_stub/Makefile \
+       src/dir/test/Makefile \
+       src/dir/Makefile \
+       src/export/Makefile \
+       src/finale/Makefile \
+       src/fsint/Makefile \
+       src/fsprobe/Makefile \
+       src/ftpd43+/Makefile \
+       src/gtx/Makefile \
+       src/inetd/Makefile \
+       src/kauth/test/Makefile \
+       src/kauth/Makefile \
+       src/libacl/test/Makefile \
+       src/libacl/Makefile \
+       src/libadmin/adminutil/Makefile \
+       src/libadmin/Makefile \
+       src/libadmin/bos/Makefile \
+       src/libadmin/cfg/test/Makefile \
+       src/libadmin/cfg/Makefile \
+       src/libadmin/client/Makefile \
+       src/libadmin/kas/Makefile \
+       src/libadmin/pts/Makefile \
+       src/libadmin/samples/Makefile \
+       src/libadmin/test/Makefile \
+       src/libadmin/vos/Makefile \
+       src/libafs/Makefile \
+       src/libafs/MakefileProto.${MKAFS_OSTYPE} \
+       src/libafsauthent/Makefile \
+       src/libafsrpc/Makefile \
+       src/libuafs/Makefile \
+       src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
+       src/log/test/Makefile \
+       src/log/Makefile \
+       src/login/Makefile \
+       src/lwp/test/Makefile \
+       src/lwp/Makefile \
+       src/mpp/Makefile \
+       src/ntp/Makefile \
+       src/null/Makefile \
+       src/package/Makefile \
+       src/pam/Makefile \
+       src/pinstall/test/Makefile \
+       src/pinstall/Makefile \
+       src/procmgmt/Makefile \
+       src/procmgmt/test/Makefile \
+       src/ptserver/Makefile \
+       src/rcp/Makefile \
+       src/rlogind/Makefile \
+       src/rsh/Makefile \
+       src/rx/Makefile \
+       src/rx/bulk.example/Makefile \
+       src/rx/bulktest/Makefile \
+       src/rx/multi.example/Makefile \
+       src/rx/simple.example/Makefile \
+       src/rx/test/Makefile \
+       src/rxgen/Makefile \
+       src/rxkad/Makefile \
+       src/rxkad/test/Makefile \
+       src/rxstat/Makefile \
+       src/scout/Makefile \
+       src/sgistuff/Makefile \
+       src/sia/Makefile \
+       src/sys/Makefile \
+       src/tbutc/Makefile \
+       src/tsm41/Makefile \
+       src/tviced/Makefile \
+       src/ubik/Makefile \
+       src/update/Makefile \
+       src/usd/test/Makefile \
+       src/usd/Makefile \
+       src/uss/Makefile \
+       src/util/Makefile \
+       src/util/test/Makefile \
+       src/venus/test/Makefile \
+       src/venus/Makefile \
+       src/vfsck/Makefile \
+       src/viced/Makefile \
+       src/vlserver/Makefile \
+       src/vol/Makefile \
+       src/vol/test/Makefile \
+       src/volser/Makefile \
+       src/wsadmin.src/Makefile \
+       src/xstat/Makefile 
 
 pristine: distclean
        /bin/rm -f src/config/afsconfig.h.in configure aclocal.m4
index 8dd599f..0dedc8b 100644 (file)
@@ -402,14 +402,9 @@ AC_SUBST(WITH_INSECURE)
 
 AC_OUTPUT(             \
 Makefile               \
-src/config/Makefile.version-NOCML \
-src/config/Makefile.${AFS_SYSNAME} \
-src/libafs/MakefileProto.${MKAFS_OSTYPE} \
-src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
-src/pam/Makefile \
-src/afsd/afs.ppc_darwin.plist \
 src/afs/Makefile \
 src/afsd/Makefile \
+src/afsd/afs.ppc_darwin.plist \
 src/afsmonitor/Makefile \
 src/afsweb/Makefile \
 src/audit/Makefile \
@@ -428,6 +423,8 @@ src/cmd/Makefile \
 src/comerr/test/Makefile \
 src/comerr/Makefile \
 src/config/Makefile \
+src/config/Makefile.version-NOCML \
+src/config/Makefile.${AFS_SYSNAME} \
 src/dauth/Makefile \
 src/des/test/Makefile \
 src/des/Makefile \
@@ -456,8 +453,10 @@ src/libadmin/pts/Makefile \
 src/libadmin/samples/Makefile \
 src/libadmin/test/Makefile \
 src/libadmin/vos/Makefile \
+src/libafs/MakefileProto.${MKAFS_OSTYPE} \
 src/libafsauthent/Makefile \
 src/libafsrpc/Makefile \
+src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
 src/log/test/Makefile \
 src/log/Makefile \
 src/login/Makefile \
index 0258168..38ea910 100644 (file)
@@ -16,11 +16,9 @@ UKERNELDIR = ../libuafs/
 
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
-
 include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
 
-system: install
+all: install
 
 # NOTE: linux case uses --new as well to work around bug in some versions of
 # gencat.
@@ -46,7 +44,7 @@ kinstall: AFS_component_version_number.c
 
 
 
-ukinstall webinstall: AFS_component_version_number.c
+ukinstall: AFS_component_version_number.c
        set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
        -chmod 666 ${UKERNELDIR}afs/*
        ${DESTDIR}bin/compile_et -v 2 afs_trace.et
@@ -54,8 +52,7 @@ ukinstall webinstall: AFS_component_version_number.c
        ${INSTALL} VNOPS/*.[csh] ${UKERNELDIR}afs
        ${INSTALL} UKERNEL/*.[csh] ${UKERNELDIR}afs
 
-noversion: install.noversion
-install install.noversion: kinstall ukinstall
+install: kinstall ukinstall
        ${INSTALL} afs.h ${DESTDIR}include/afs
        ${INSTALL} ${AFS_OSTYPE}/osi_inode.h ${DESTDIR}include/afs
        ${INSTALL} afs_stats.h exporter.h nfsclient.h  ${DESTDIR}include/afs
@@ -78,3 +75,5 @@ install install.noversion: kinstall ukinstall
 
 clean:
        rm -f *.o core AFS_component_version_number.c afs_trace.h afs_trace.msf afszcm.cat
+
+include ../config/Makefile.version
index 4d0c8f7..9e68df6 100644 (file)
@@ -13,29 +13,21 @@ SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 
-SOURCES = afsd.c sys.c
-
-
 include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
 
-INSTALLro = ${INSTALL} -m 644
-INSTALLex = ${INSTALL} -m 755
-CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 LDFLAGS = -g ${XLDFLAGS}
 
-noversion: install
-
 #
 # What to make
 #
-all:   afsd vsys
+all: afsd vsys
 
 #
 # Programs
 #
 
-AFSLIBS=$(SRCDIR)lib/afs/libauth.a ${SRCDIR}lib/afs/libcmd.a $(SRCDIR)lib/afs/libsys.a $(SRCDIR)lib/afs/util.a $(SRCDIR)lib/librx.a $(SRCDIR)lib/liblwp.a $(SRCDIR)lib/afs/util.a 
+AFSLIBS=$(SRCDIR)lib/afs/libauth.a ${SRCDIR}/lib/afs/libcmd.a $(SRCDIR)lib/afs/libsys.a $(SRCDIR)lib/afs/util.a $(SRCDIR)lib/librx.a $(SRCDIR)lib/liblwp.a $(SRCDIR)lib/afs/util.a 
 
 afsd: afsd.o $(AFSLIBS)
        case ${SYS_NAME} in \
@@ -48,7 +40,7 @@ afsd: afsd.o $(AFSLIBS)
        esac
 
 vsys: vsys.o
-       $(CC) -g -o vsys vsys.o ${SRCDIR}lib/afs/libsys.a $(LDFLAGS) ${XLIBS}
+       $(CC) -g -o vsys vsys.o ${SRCDIR}/lib/afs/libsys.a $(LDFLAGS) ${XLIBS}
 
 #
 # Objects
@@ -60,13 +52,10 @@ vsys.o: vsys.c AFS_component_version_number.c
 clean:
        rm -f *.o vsys afsd core AFS_component_version_number.c
 
-beancount:
-       wc -l afsd.c
-
 system: install
 
 install: all
-       ${INSTALL} vsys ${DESTDIR}etc
+       ${INSTALL} vsys ${DESTDIR}/etc
        ${INSTALL} afsd ${DESTDIR}root.client/usr/vice/etc
        case ${SYS_NAME} in \
                rs_aix*)  \
@@ -114,3 +103,5 @@ install: all
                * )  \
                        echo No rc scripts installed for ${SYS_NAME} ;; \
        esac
+
+include ../config/Makefile.version
index a51f005..2f546f6 100644 (file)
@@ -13,52 +13,45 @@ SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 
-
-
 include ../config/Makefile.${SYS_NAME}
 
 CFLAGS=-g -I. \
        -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include \
-       -I${SRCDIR}include/afs \
+       -I${SRCDIR}/include \
+       -I${SRCDIR}/include/afs \
        -I${SRCDIR} ${XCFLAGS}
 LDFLAGS = ${XLDFLAGS}
-RPCINCLS=
 
-INCLS=${SRCDIR}include/afs/gtxobjects.h \
-       ${SRCDIR}include/afs/gtxwindows.h \
-       ${SRCDIR}include/afs/gtxcurseswin.h \
-       ${SRCDIR}include/afs/gtxdumbwin.h \
-       ${SRCDIR}include/afs/gtxX11win.h \
-       ${SRCDIR}include/afs/gtxobjects.h \
-       ${SRCDIR}include/afs/gtxlightobj.h \
-       ${SRCDIR}include/afs/gtxtextobj.h \
-       ${SRCDIR}include/afs/gtxobjdict.h \
-       ${RPCINCLS} \
-       ${SRCDIR}include/afs/keys.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/afs/cmd.h \
-       ${SRCDIR}include/afs/xstat_fs.h \
-       ${SRCDIR}include/afs/xstat_cm.h \
+INCLS=${SRCDIR}/include/afs/gtxobjects.h \
+       ${SRCDIR}/include/afs/gtxwindows.h \
+       ${SRCDIR}/include/afs/gtxcurseswin.h \
+       ${SRCDIR}/include/afs/gtxdumbwin.h \
+       ${SRCDIR}/include/afs/gtxX11win.h \
+       ${SRCDIR}/include/afs/gtxobjects.h \
+       ${SRCDIR}/include/afs/gtxlightobj.h \
+       ${SRCDIR}/include/afs/gtxtextobj.h \
+       ${SRCDIR}/include/afs/gtxobjdict.h \
+       ${SRCDIR}/include/afs/keys.h \
+       ${SRCDIR}/include/afs/cellconfig.h \
+       ${SRCDIR}/include/afs/cmd.h \
+       ${SRCDIR}/include/afs/xstat_fs.h \
+       ${SRCDIR}/include/afs/xstat_cm.h \
        afsmonitor.h \
        afsmon-labels.h
-LIBS=${SRCDIR}lib/afs/libxstat_fs.a \
-       ${SRCDIR}lib/afs/libxstat_cm.a \
-       ${SRCDIR}lib/afs/libgtx.a \
-       ${SRCDIR}lib/afs/libafsint.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/util.a 
-
-EXTRA_LIBS= ${TXLIBS} ${SRCDIR}lib/afs/libtermlib.a  ${XLIBS} 
-
-include ../config/Makefile.version
-
-noversion: install
+LIBS=${SRCDIR}/lib/afs/libxstat_fs.a \
+       ${SRCDIR}/lib/afs/libxstat_cm.a \
+       ${SRCDIR}/lib/afs/libgtx.a \
+       ${SRCDIR}/lib/afs/libafsint.a \
+       ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/afs/util.a 
+
+EXTRA_LIBS= ${TXLIBS} ${SRCDIR}/lib/afs/libtermlib.a  ${XLIBS} 
 
 all: afsmonitor 
+system: install
 
 afsmon-output.o: afsmon-output.c ${INCLS}
 afsmon-win.o: afsmon-win.c ${INCLS}
@@ -72,18 +65,13 @@ afsmon-parselog:  afsmon-parselog.o ${LIBS}
        ${CC} ${CFLAGS} -o afsmon-parselog afsmon-parselog.c \
                ${LIBS} ${EXTRA_LIBS}
 
-#gtxtest.o:    gtxtest.c ${INCLS}
-#gtxtest:      gtxtest.o ${LIBS}
-#              cc ${CFLAGS} -o gtxtest gtxtest.o ${LIBS} ${EXTRA_LIBS} 
-
 #
 # Misc others
 #
-system: install
-
 install: all
-       ${INSTALL} afsmonitor ${DESTDIR}bin
+       ${INSTALL} afsmonitor ${DESTDIR}/bin
 
 clean:
-       rm -f  *.o afsmonitor AFS_component_version_number.c
+       rm -f *.o afsmonitor AFS_component_version_number.c
 
+include ../config/Makefile.version
index af38361..7984986 100644 (file)
@@ -16,7 +16,7 @@ SHELL=/bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR=../libuafs/
-COMPILE_ET=${SRCDIR}bin/compile_et
+COMPILE_ET=${SRCDIR}/bin/compile_et
 
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
@@ -41,9 +41,7 @@ APACHEAFS_DOC=README
 APACHE_INSTALL_SCRIPT=afswsApache_config.sh 
 NETSCAPE_INSTALL_SCRIPT=afswsNetscape_config.sh
 
-
-
-system noversion apache_afs_web_secure:
+system apache_afs_web_secure:
        case "${SYS_NAME}" in \
                rs_aix* ) \
                        echo Clean, make, and install the lib for 1.2 ; \
@@ -121,8 +119,6 @@ system noversion apache_afs_web_secure:
        chmod a+w ${DESTDIR}root.afsweb/install/${APACHE_INSTALL_SCRIPT}
        ${INSTALL} $(BINARIES) ${DESTDIR}root.afsweb/bin
 
-include ../config/Makefile.version
-
 all:
 
 install: kinstall ukinstall
@@ -132,8 +128,8 @@ kinstall:
 
 
 webinstall:${UKSRCS}
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+       set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED)
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs
 
 ukinstall:
        @echo No $@ source here.
@@ -155,29 +151,29 @@ OPTF=
 DEBUG_FLAG=
 AUX_CFLAGS=
 VERSION_CFLAG=
-AFS_INCL=-I${SRCDIR}include -I.. -I../config
+AFS_INCL=-I${SRCDIR}/include -I.. -I../config
 CFLAGS=$(OPTF) $(DEFINES) -I. -I.. $(EXTRA_CFLAGS) $(VERSION_CFLAG) $(DEBUG_FLAG)
-INCLS=${SRCDIR}include/ubik.h \
-             ${SRCDIR}include/lwp.h \
-             ${SRCDIR}include/lock.h  \
-             ${SRCDIR}include/rx/rx.h \
-             ${SRCDIR}include/rx/xdr.h \
-             ${SRCDIR}include/rx/rxkad.h \
-             ${SRCDIR}include/afs/com_err.h \
+INCLS=${SRCDIR}/include/ubik.h \
+             ${SRCDIR}/include/lwp.h \
+             ${SRCDIR}/include/lock.h  \
+             ${SRCDIR}/include/rx/rx.h \
+             ${SRCDIR}/include/rx/xdr.h \
+             ${SRCDIR}/include/rx/rxkad.h \
+             ${SRCDIR}/include/afs/com_err.h \
             weblog_errors.h $(DCE_DLOG_INCLUDES)
-deslib=${SRCDIR}lib/libdes.a
-rxkadlib=${SRCDIR}lib/librxkad.a
-authlib=${SRCDIR}lib/afs/libauth.a
-cmdlib=${SRCDIR}lib/afs/libcmd.a
-utilib=${SRCDIR}lib/afs/util.a
-auditlib=${SRCDIR}lib/afs/libaudit.a
-kauthlib=${SRCDIR}lib/afs/libkauth.a
-
-LIBS = ${kauthlib} ${SRCDIR}lib/libubik.a ${SRCDIR}lib/afs/libprot.a \
-       ${authlib} ${rxkadlib} ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a  \
-       ${SRCDIR}lib/liblwp.a ${deslib} ${cmdlib} \
-       ${SRCDIR}lib/afs/libcom_err.a ${utilib} \
+deslib=${SRCDIR}/lib/libdes.a
+rxkadlib=${SRCDIR}/lib/librxkad.a
+authlib=${SRCDIR}/lib/afs/libauth.a
+cmdlib=${SRCDIR}/lib/afs/libcmd.a
+utilib=${SRCDIR}/lib/afs/util.a
+auditlib=${SRCDIR}/lib/afs/libaudit.a
+kauthlib=${SRCDIR}/lib/afs/libkauth.a
+
+LIBS = ${kauthlib} ${SRCDIR}/lib/libubik.a ${SRCDIR}/lib/afs/libprot.a \
+       ${authlib} ${rxkadlib} ${SRCDIR}/lib/afs/libsys.a ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/afs/libsys.a  \
+       ${SRCDIR}/lib/liblwp.a ${deslib} ${cmdlib} \
+       ${SRCDIR}/lib/afs/libcom_err.a ${utilib} \
        $(DBM) $(XLIBS)
 
 AR=ar
@@ -241,3 +237,5 @@ clean:
 libclean:
        -/bin/rm -f $(APACHE_AFS_LIB) $(LIBOBJS)
 
+include ../config/Makefile.version
+
index cd553e0..9eaf4ae 100644 (file)
@@ -19,62 +19,47 @@ SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 
-
 include ../config/Makefile.${SYS_NAME}
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 UKERNELDIR = ../libuafs/
-LOCALDIR = ${DESTDIR}root.server/usr/afs/local/
-
-audobjs = audit.o
 
 CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I$(SRCDIR)include ${XCFLAGS}
 
-include ../config/Makefile.version
-
-noversion system: install
-
-UKSRCS = audit.h
+all: install
 
-all:  libaudit.a 
-
-headers: audit.h
-       ${INSTALL} audit.h ${DESTDIR}include/afs
-
-install: ukinstall libaudit.a 
-       ${INSTALL} libaudit.a ${DESTDIR}lib/afs
-       ${INSTALL} audit.h ${DESTDIR}include/afs
+install: ukinstall ${DESTDIR}/lib/afs/libaudit.a ${DESTDIR}/include/afs/audit.h
        case ${SYS_NAME} in \
        rs_aix*) \
-          ${INSTALL} Audit              ${LOCALDIR}                     ;  \
-          ${INSTALL} objects.aix.sample ${LOCALDIR}audit/objects.sample ;  \
-          ${INSTALL} events.aix.sample  ${LOCALDIR}audit/events.sample  ;  \
-          ${INSTALL} config.aix.sample  ${LOCALDIR}audit/config.sample  ;; \
+          ${INSTALL} Audit              ${DESTDIR}/root.server/usr/afs/local ;  \
+          ${INSTALL} objects.aix.sample ${DESTDIR}/root.server/usr/afs/local/audit/objects.sample ;  \
+          ${INSTALL} events.aix.sample  ${DESTDIR}/root.server/usr/afs/local/audit/events.sample  ;  \
+          ${INSTALL} config.aix.sample  ${DESTDIR}/root.server/usr/afs/local/audit/config.sample  ;; \
         *) ;; \
         esac ;
 
+ukinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afs/audit.h
+
+${UKERNELDIR}/afs:
+       mkdir -p ${UKERNELDIR}/afs
 
-kinstall:
-       @echo No $@ source here.
+${UKERNELDIR}/afs/audit.h: audit.h
+       ${INSTALL} $? $@
 
-ukinstall webinstall:
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+${DESTDIR}/include/afs/audit.h: audit.h
+       ${INSTALL} $? $@
 
-doc:
-       echo no documents in this directory
+${DESTDIR}/lib/afs/libaudit.a: libaudit.a
+       ${INSTALL} $? $@
 
-libaudit.a: ${audobjs} AFS_component_version_number.o
+libaudit.a: audit.o AFS_component_version_number.o
        rm -f libaudit.a
-       ar r libaudit.a ${audobjs} AFS_component_version_number.o
+       ar r libaudit.a audit.o AFS_component_version_number.o
        $(RANLIB) libaudit.a
 
 audit.o: audit.c audit.h 
        ${CC} ${CFLAGS} -c audit.c
 
 clean:
-       rm -f *.o core AFS_component_version_number.c *.a
-
-beancount:
-       wc -l *.c *.h
+       rm -f *.a *.o core AFS_component_version_number.c
 
+include ../config/Makefile.version
index fa89271..1c8bfe4 100644 (file)
@@ -12,47 +12,38 @@ SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 
-
 include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
-COMPILE_ET = ${SRCDIR}bin/compile_et
+COMPILE_ET = ${SRCDIR}/bin/compile_et
 OBJS= cellconfig.o ktc.o userok.o writeconfig.o authcon.o \
-    acfg_errors.o ktc_errors.o # comktc.o comvice.o comauth.o 
+    acfg_errors.o ktc_errors.o
 KOBJS= cellconfig.o ktc.krb.o userok.o writeconfig.o authcon.o \
-    acfg_errors.o ktc_errors.o # comktc.o comvice.o comauth.o 
-
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} 
-LDIRS= 
-LIBS= libauth.a ${DESTDIR}lib/afs/libsys.a \
-      ${DESTDIR}lib/librxkad.a ${DESTDIR}lib/libdes.a \
-      ${DESTDIR}lib/librx.a ${DESTDIR}lib/afs/libsys.a \
-      ${DESTDIR}lib/liblwp.a ${SRCDIR}lib/afs/util.a ${XLIBS}
-INCLS=cellconfig.h auth.h keys.h # comauth.h
+    acfg_errors.o ktc_errors.o
+
+CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} 
+LIBS= libauth.a ${DESTDIR}/lib/afs/libsys.a \
+      ${DESTDIR}/lib/librxkad.a ${DESTDIR}/lib/libdes.a \
+      ${DESTDIR}/lib/librx.a ${DESTDIR}/lib/afs/libsys.a \
+      ${DESTDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/util.a ${XLIBS}
+INCLS=cellconfig.h auth.h keys.h
 KSRCS=auth.h
 UKSRCS=${KSRCS} cellconfig.h acfg_errors.c keys.h cellconfig.c \
        ktc.c authcon.c ktc_errors.c
 
-include ../config/Makefile.version
-
-system install noversion: install.noversion
-
-all: libauth.a libauth.krb.a setkey
+all: install
 
 cellconfig.o: cellconfig.c ${INCLS}
-#comktc.o: comktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
-#comvice.o: comvice.c ${INCLS}
-ktc.o: ktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
+ktc.o: ktc.c ${INCLS} ${SRCDIR}/include/afs/vice.h
 writeconfig.o: writeconfig.c ${INCLS}
 authcon.o: authcon.c ${INCLS}
 userok.o: userok.c ${INCLS}
 cellconfig.o: cellconfig.c ${INCLS}
 copyauth.o: copyauth.c ${INCLS} AFS_component_version_number.o
 setkey.o: setkey.c ${INCLS} AFS_component_version_number.o
-#comauth.o: comauth.c ${INCLS} ${SRCDIR}include/afs/vice.h
 
-ktc.krb.o: ktc.c ${INCLS} ${SRCDIR}include/afs/vice.h
+ktc.krb.o: ktc.c ${INCLS} ${SRCDIR}/include/afs/vice.h
        ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ktc.c -o ktc.krb.o
 
 libauth.a: $(OBJS) AFS_component_version_number.o
@@ -66,10 +57,10 @@ libauth.krb.a: $(KOBJS) AFS_component_version_number.o
        $(RANLIB) libauth.krb.a
 
 copyauth: copyauth.o
-       $(CC) $(CFLAGS) $(LDIRS) -o copyauth copyauth.o ${LIBS}
+       $(CC) $(CFLAGS) -o copyauth copyauth.o ${LIBS}
 
 setkey: setkey.o
-       ${CC} $(CFLAGS) $(LDIRS) -o setkey setkey.o ${LIBS}
+       ${CC} $(CFLAGS) -o setkey setkey.o ${LIBS}
 
 acfg_errors.o: acfg_errors.c
 
@@ -81,31 +72,83 @@ ktc_errors.o: ktc_errors.c
 ktc_errors.c auth.h: ktc_errors.et auth.p.h
        rm -f auth.h ktc_errors.c; ${COMPILE_ET} ktc_errors -h auth
 
-test: 
-       cd test; $(MAKE)
+#
+# Install targets
+#
+kinstall: ${KERNELDIR}/afs/auth.h
+
+${KERNELDIR}/afs/auth.h: auth.h
+       ${INSTALL} $? $@
+
+ukinstall: \
+       ${UKERNELDIR}/afs/auth.h \
+       ${UKERNELDIR}/afs/cellconfig.h \
+       ${UKERNELDIR}/afs/acfg_errors.c \
+       ${UKERNELDIR}/afs/keys.h \
+       ${UKERNELDIR}/afs/cellconfig.c \
+       ${UKERNELDIR}/afs/ktc.c \
+       ${UKERNELDIR}/afs/authcon.c \
+       ${UKERNELDIR}/afs/ktc_errors.c
+
+${UKERNELDIR}/afs/auth.h: auth.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/cellconfig.h: cellconfig.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/cellconfig.c: cellconfig.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/acfg_errors.c: acfg_errors.c
+       ${INSTALL} $? $@
 
-kinstall: ${KSRCS}
-       ${INSTALL} ${KSRCS} ${KERNELDIR}afs
+${UKERNELDIR}/afs/keys.h: keys.h
+       ${INSTALL} $? $@
 
-ukinstall webinstall: ${UKSRCS}
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+${UKERNELDIR}/afs/ktc.c: ktc.c
+       ${INSTALL} $? $@
 
-${DESTDIR}etc/copyauth: copyauth
-       ${INSTALL} copyauth ${DESTDIR}etc/copyauth
+${UKERNELDIR}/afs/authcon.c: authcon.c
+       ${INSTALL} $? $@
 
-install.noversion: all kinstall ukinstall ${DESTDIR}etc/copyauth
-       ${INSTALL} libauth.a ${DESTDIR}lib/afs/libauth.a
-       ${INSTALL} libauth.krb.a ${DESTDIR}lib/afs/libauth.krb.a
-       ${INSTALL} auth.h ${DESTDIR}include/afs
-#      ${INSTALL} comauth.h ${DESTDIR}include/afs
-       ${INSTALL} cellconfig.h ${DESTDIR}include/afs
-       ${INSTALL} keys.h ${DESTDIR}include/afs
+${UKERNELDIR}/afs/ktc_errors.c: ktc_errors.c
+       ${INSTALL} $? $@
 
-includes: auth.h cellconfig.h keys.h
-       ${INSTALL} auth.h ${DESTDIR}include/afs
-       ${INSTALL} cellconfig.h ${DESTDIR}include/afs
-       ${INSTALL} keys.h ${DESTDIR}include/afs
+install: kinstall ukinstall \
+       ${DESTDIR}/lib/afs/libauth.a \
+       ${DESTDIR}/lib/afs/libauth.krb.a \
+       ${DESTDIR}/include/afs/keys.h \
+       ${DESTDIR}/include/afs/cellconfig.h \
+       ${DESTDIR}/include/afs/auth.h \
+       ${DESTDIR}/etc/copyauth \
+       setkey
+
+${DESTDIR}/lib/afs/libauth.a: libauth.a
+       ${INSTALL} $? $@
+
+${DESTDIR}/lib/afs/libauth.krb.a: libauth.krb.a
+       ${INSTALL} $? $@
+
+${DESTDIR}/etc/copyauth: copyauth
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/afs/keys.h: keys.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/afs/cellconfig.h: cellconfig.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/afs/auth.h: auth.h
+       ${INSTALL} $? $@
+
+#
+# Misc. targets
+#
+test: 
+       cd test; $(MAKE)
 
 clean:
-       rm -f *.o *.a copyauth testcellconf setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core\
+       rm -f *.o *.a copyauth setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core\
        AFS_component_version_number.c
+
+include ../config/Makefile.version
index 1f1ec5d..0c403cc 100644 (file)
@@ -16,8 +16,8 @@ SRCDIR=
 
 OPTIMIZE=-O
 
-INCDIRS= -I./ -I${DESTDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L${DESTDIR}lib/rx
+INCDIRS= -I./ -I${DESTDIR}/include
+LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L${DESTDIR}/lib/rx
 LIBS= -lauth -lsys -lrx -llwp -lafsutil ${XLIBS}
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS}
index b285ba5..8a29d8f 100644 (file)
@@ -15,39 +15,32 @@ SHELL=/bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET=$(SRCDIR)bin/compile_et
-CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h bosint.h
-INCLS=bnode.h ${RPCINCLS} ${SRCDIR}include/afs/auth.h \
-     ${SRCDIR}include/afs/keys.h  ${SRCDIR}include/afs/cellconfig.h \
-     ${SRCDIR}include/afs/cmd.h ${SRCDIR}include/afs/ktime.h
+CFLAGS=-g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
+RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h bosint.h
+INCLS=bnode.h ${RPCINCLS} ${SRCDIR}/include/afs/auth.h \
+     ${SRCDIR}/include/afs/keys.h  ${SRCDIR}/include/afs/cellconfig.h \
+     ${SRCDIR}/include/afs/cmd.h ${SRCDIR}/include/afs/ktime.h
 
-auditlib=${SRCDIR}/lib/afs/libaudit.a
-
-#have to search libauth.a twice to get error stuff done right.
 # EH 12/18/90 - have to search librx.a twice on Ultrix 4.0
-LIBS=${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a \
-     ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/libkauth.a \
-     ${SRCDIR}lib/afs/libvolser.a \
-     ${SRCDIR}lib/afs/libvldb.a \
-     ${SRCDIR}lib/afs/libauth.a \
-     ${SRCDIR}lib/librxstat.a \
-     ${SRCDIR}lib/librxkad.a ${SRCDIR}lib/libdes.a \
-     ${SRCDIR}lib/librx.a \
-     ${SRCDIR}lib/libubik.a \
-     ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a \
-     ${SRCDIR}lib/afs/libsys.a \
-     ${SRCDIR}lib/afs/libprocmgmt.a
+LIBS=${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a \
+     ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/afs/libkauth.a \
+     ${SRCDIR}/lib/afs/libvolser.a \
+     ${SRCDIR}/lib/afs/libvldb.a \
+     ${SRCDIR}/lib/afs/libauth.a \
+     ${SRCDIR}/lib/librxstat.a \
+     ${SRCDIR}/lib/librxkad.a ${SRCDIR}/lib/libdes.a \
+     ${SRCDIR}/lib/librx.a \
+     ${SRCDIR}/lib/libubik.a \
+     ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/util.a \
+     ${SRCDIR}/lib/afs/libsys.a \
+     ${SRCDIR}/lib/afs/libprocmgmt.a
 
 OBJS=bosserver.o bnode.o ezbnodeops.o fsbnodeops.o bosint.ss.o bosint.xdr.o \
 bosoprocs.o cronbnodeops.o
 
 LIBOBJS=bosint.xdr.o bosint.cs.o boserr.o
 
-include ../config/Makefile.version
-
-noversion: install
-
-all: bosserver bos libbos.a
+all: install
 
 $(OBJS) $(LIBOBJS): $(INCLS)
 
@@ -56,7 +49,7 @@ 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
-       ${SRCDIR}bin/rxgen -x bosint.xg
+       ${SRCDIR}/bin/rxgen -x bosint.xg
 
 bnode.h boserr.c: bnode.p.h boserr.et
        rm -f boserr.c bnode.h; $(COMPILE_ET) boserr -h bnode
@@ -84,21 +77,44 @@ libbos.a: $(LIBOBJS) AFS_component_version_number.o
        $(RANLIB) libbos.a
 
 bosserver: $(OBJS) $(LIBS)
-       ${CC} $(CFLAGS) -o bosserver $(OBJS) ${auditlib} $(LIBS)  ${XLIBS} 
+       ${CC} $(CFLAGS) -o bosserver $(OBJS) ${SRCDIR}/lib/afs/libaudit.a $(LIBS)  ${XLIBS} 
+
+#
+# Install targets
+#
+install: ${DESTDIR}/root.server/usr/afs/bin/bosserver \
+       ${DESTDIR}/include/afs/bosint.h \
+       ${DESTDIR}/bin/bos \
+       ${DESTDIR}/root.server/usr/afs/bin/bos \
+       ${DESTDIR}/lib/afs/libbos.a \
+       ${DESTDIR}/include/afs/bnode.h
+
+${DESTDIR}/root.server/usr/afs/bin/bosserver: bosserver
+       ${INSTALL} $? $@
 
-system: install
+${DESTDIR}/include/afs/bosint.h: bosint.h
+       ${INSTALL} $? $@
 
-install: all
-       ${INSTALL} bosserver ${DESTDIR}root.server/usr/afs/bin
-       ${INSTALL} bosint.h ${DESTDIR}include/afs/bosint.h
-       ${INSTALL} bos ${DESTDIR}bin
-       ${INSTALL} bos ${DESTDIR}root.server/usr/afs/bin
-       ${INSTALL} libbos.a ${DESTDIR}lib/afs/libbos.a
-       ${INSTALL} bnode.h ${DESTDIR}include/afs/bnode.h
+${DESTDIR}/bin/bos: bos
+       ${INSTALL} $? $@
 
+${DESTDIR}/root.server/usr/afs/bin/bos: bos
+       ${INSTALL} $? $@
+
+${DESTDIR}/lib/afs/libbos.a: libbos.a
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/afs/bnode.h: bnode.h
+       ${INSTALL} $? $@
+
+#
+# Misc. targets
+#
 clean:
        rm -f  *.a *.o bos bosserver testproc bosint.cs.c bosint.ss.c bosint.xdr.c bosint.h core boserr.c bnode.h\
        AFS_component_version_number.c
 
 test: 
        cd test; $(MAKE) 
+
+include ../config/Makefile.version
index e1dad6e..0b21882 100644 (file)
@@ -15,8 +15,8 @@ SRCDIR=
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include
+LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -L${BACKDIR}/lib -L${BACKDIR}/lib/afs
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
 
index 07ccfc1..c452fa3 100644 (file)
@@ -14,37 +14,28 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET = ${DESTDIR}/bin/compile_et
-CFLAGS= -g -w -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include -I${SRCDIR}include/afs ${XCFLAGS}
+CFLAGS= -g -w -I${TOP_SRCDIR}/config -I${SRCDIR}/include -I${SRCDIR}/include/afs ${XCFLAGS}
 LDFLAGS = ${XLDFLAGS}
 
-include ../config/Makefile.version
-
-noversion: install
-
-all: fms
+all: install
 
-FMSOBJS = fms.o
-FMSLIBS=${DESTDIR}lib/afs/libcmd.a \
+FMSLIBS=${DESTDIR}/lib/afs/libcmd.a \
        ${TXLIBS} \
         $(SRCDIR)lib/afs/libusd.a \
        $(SRCDIR)lib/afs/libtermlib.a ${XLIBS} \
        $(SRCDIR)lib/afs/util.a
 
-fms:   ${FMSOBJS}
-       ${CC} ${LDFLAGS} -o fms ${FMSOBJS} ${FMSLIBS}
+fms: fms.o
+       ${CC} ${LDFLAGS} -o fms fms.o ${FMSLIBS}
 
 fms.o:  fms.c AFS_component_version_number.o
 
-#
-# global operations 
-#
+install: ${DESTDIR}/etc/fms
 
-system:        install
-
-install:       all
-       ${INSTALL} fms ${DESTDIR}etc
+${DESTDIR}/etc/fms: fms
+       ${INSTALL} $? $@
 
 clean:
        rm -f *.o fms AFS_component_version_number.c
+
+include ../config/Makefile.version
index 8b3f2c6..5eb9583 100644 (file)
@@ -19,11 +19,7 @@ COMPILE_ET = ${SRCDIR}bin/compile_et
 
 CFLAGS= ${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
 
-include ../config/Makefile.version
-
-noversion: install
-
-all: libbubasics.a bumon.h butc.h bubasics.h tcdata.h butm.h
+all: install
 
 OBJS=butc.ss.o butc.cs.o butc.xdr.o bumon.ss.o bumon.cs.o bumon.xdr.o butc_errs.o butm_errs.o butx_errs.o
 
@@ -39,25 +35,55 @@ bumon.xdr.c bumon.ss.c bumon.cs.c bumon.h: bumon.xg
        ${RXGEN} bumon.xg
 
 butm_errs.c butm.h: butm_errs.et butm.p.h
-       rm -f butm.h butm_errs.c; ${COMPILE_ET} butm_errs -h butm
+       rm -f butm.h butm_errs.c
+       ${COMPILE_ET} butm_errs -h butm
 
 butc_errs.c tcdata.h: butc_errs.et tcdata.p.h butm.h
-       rm -f tcdata.h butc_errs.c; ${COMPILE_ET} butc_errs -h tcdata
+       rm -f tcdata.h butc_errs.c
+       ${COMPILE_ET} butc_errs -h tcdata
 
 butx_errs.c butx.h: butx_errs.et
-       rm -f butx.h butx_errs.c; ${COMPILE_ET} butx_errs -h butx
+       rm -f butx.h butx_errs.c
+       ${COMPILE_ET} butx_errs -h butx
+
+#
+# Installation targets
+#
+install: ${DESTDIR}/lib/afs/libbubasics.a \
+       ${DESTDIR}/include/afs/bumon.h \
+       ${DESTDIR}/include/afs/butc.h \
+       ${DESTDIR}/include/afs/bubasics.h \
+       ${DESTDIR}/include/afs/tcdata.h \
+       ${DESTDIR}/include/afs/butm.h \
+       ${DESTDIR}/include/afs/butx.h
+
+${DESTDIR}/lib/afs/libbubasics.a: libbubasics.a
+       ${INSTALL} $? $@
 
-system: install
+${DESTDIR}/include/afs/bumon.h: bumon.h
+       ${INSTALL} $? $@
 
-${DESTDIR}lib/afs/libbubasics.a: libbubasics.a 
-       ${INSTALL}   $? $@
+${DESTDIR}/include/afs/butc.h: butc.h
+       ${INSTALL} $? $@
 
+${DESTDIR}/include/afs/bubasics.h: bubasics.h
+       ${INSTALL} $? $@
 
-install: all ${DESTDIR}lib/afs/libbubasics.a
-       ${INSTALL} bubasics.h butc.h bumon.h butm.h butx.h tcdata.h ${DESTDIR}include/afs
+${DESTDIR}/include/afs/tcdata.h: tcdata.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/afs/butm.h: butm.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/afs/butx.h: butx.h
+       ${INSTALL} $? $@
+
+#
+# Common targets
+#
 
 clean:
-       -rm -f *.o *.a *.xdr.c *.ss.c *.cs.c \
-butc.h butx.h butm.h bumon.h tcdata.h \
-butc_errs.c butx_errs.c butm_errs.c \
-core AFS_component_version_number.c
+       rm -f *.o *.a *.xdr.c *.ss.c *.cs.c butc.h butx.h butm.h bumon.h tcdata.h \
+               butc_errs.c butx_errs.c butm_errs.c core AFS_component_version_number.c
+
+include ../config/Makefile.version
index 968574a..30e1d12 100644 (file)
@@ -14,33 +14,23 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET = ${SRCDIR}bin/compile_et
+COMPILE_ET = ${SRCDIR}/bin/compile_et
+RXGEN=${SRCDIR}/bin/rxgen
 
 CFLAGS= ${DBUG} -w -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include -I${SRCDIR}include/afs ${XCFLAGS}
+       -I${SRCDIR}/include -I${SRCDIR}/include/afs ${XCFLAGS}
 
-#LIBS=${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/libbubasics.a \
-#${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a \
-#$(SRCDIR)lib/librx.a $(SRCDIR)lib/liblwp.a
+LIBS=${SRCDIR}/lib/afs/libbudb.a ${SRCDIR}/lib/afs/libbubasics.a \
+        ${SRCDIR}/lib/afs/libbutm.a ${SRCDIR}/lib/afs/libvolser.a \
+        ${SRCDIR}/lib/afs/libvldb.a  ${SRCDIR}/lib/afs/vlib.a \
+        ${SRCDIR}/lib/afs/libkauth.a ${SRCDIR}/lib/libubik.a \
+        ${SRCDIR}/lib/afs/libauth.a  ${SRCDIR}/lib/librxkad.a \
+        ${SRCDIR}/lib/afs/libsys.a   ${SRCDIR}/lib/libdes.a \
+        ${SRCDIR}/lib/librx.a  ${SRCDIR}/lib/afs/libsys.a \
+        ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/libcmd.a \
+        ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/util.a 
 
-LIBS=${SRCDIR}lib/afs/libbudb.a ${SRCDIR}lib/afs/libbubasics.a \
-        ${SRCDIR}lib/afs/libbutm.a ${SRCDIR}lib/afs/libvolser.a \
-        ${SRCDIR}lib/afs/libvldb.a  ${SRCDIR}lib/afs/vlib.a \
-        ${SRCDIR}lib/afs/libkauth.a ${SRCDIR}lib/libubik.a \
-        ${SRCDIR}lib/afs/libauth.a  ${SRCDIR}lib/librxkad.a \
-        ${SRCDIR}lib/afs/libsys.a   ${SRCDIR}lib/libdes.a \
-        ${SRCDIR}lib/librx.a  ${SRCDIR}lib/afs/libsys.a \
-        ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
-        ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a 
-
-INCLS=bc.h ${SRCDIR}include/afs/butc.h
-RXGEN=${SRCDIR}bin/rxgen
-
-include ../config/Makefile.version
-
-noversion: install
-
-all: backup libbxdb.a 
+all: install
 
 libbxdb.a: dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_component_version_number.o
        -rm -f libbxdb.a
@@ -48,17 +38,17 @@ libbxdb.a: dsstub.o ubik_db_if.o status.o dlq.o bucoord_errs.o volstub.o AFS_com
                bucoord_errs.o volstub.o AFS_component_version_number.o
        ${RANLIB} libbxdb.a
 
-ttest: ttest.o ${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a libbxdb.a
+ttest: ttest.o ${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a libbxdb.a
        ${CC} ${CFLAGS} -o ttest ttest.o libbxdb.a \
-               ${SRCDIR}lib/afs/libbubasics.a \
-${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a
+               ${SRCDIR}/lib/afs/libbubasics.a \
+               ${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a
 
 ttest.o: AFS_component_version_number.c
 
-btest: btest.o ${SRCDIR}lib/afs/libbubasics.a ${SRCDIR}lib/librx.a \
-               ${SRCDIR}lib/liblwp.a
-       ${CC} ${CFLAGS} -o btest btest.o ${SRCDIR}lib/afs/libbubasics.a \
-               ${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a
+btest: btest.o ${SRCDIR}/lib/afs/libbubasics.a ${SRCDIR}/lib/librx.a \
+               ${SRCDIR}/lib/liblwp.a
+       ${CC} ${CFLAGS} -o btest btest.o ${SRCDIR}/lib/afs/libbubasics.a \
+               ${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a
 
 btest.o: AFS_component_version_number.c
 
@@ -73,7 +63,7 @@ BACKOBJS = main.o config.o dsstub.o volstub.o commands.o regex.o server.o \
 
 main.o: AFS_component_version_number.c
 
-$(BACKOBJS): $(INCLS)
+$(BACKOBJS): bc.h ${SRCDIR}/include/afs/butc.h
 
 backup:  $(BACKOBJS) ${LIBS}
        ${CC} ${CFLAGS} -o backup $(BACKOBJS) ${LIBS} ${XLIBS}
@@ -82,17 +72,24 @@ bucoord_errs.c bc.h:        bucoord_errs.et bc.p.h
        rm -f bc.h bucoord_errs.c
        ${COMPILE_ET} bucoord_errs -h bc
 
-system: install
+#
+# Install targets
+#
 
-install: all
-       ${INSTALL} libbxdb.a ${DESTDIR}lib/afs
-       ${INSTALL} backup ${DESTDIR}etc
+install: ${DESTDIR}/lib/afs/libbxdb.a \
+       ${DESTDIR}/etc/backup
+
+${DESTDIR}/lib/afs/libbxdb.a: libbxdb.a
+       ${INSTALL} $? $@
+
+${DESTDIR}/etc/backup: backup
+       ${INSTALL} $? $@
+
+#
+# Misc targets
+#
 
 clean:
        rm -f *.o backup convert *.ss.c *.cs.c *.xdr.c *.a core btest ttest AFS_component_version_number.c bc.h bucoord_errs.c
 
-lint:
-       lint -IDEST/include -IDEST/include/afs *.h *.c
-
-cxref:
-       cxref $(CFLAGS) $(BACKSRCS) > cxref.out
+include ../config/Makefile.version
index 6bb2e0c..d49cd79 100644 (file)
@@ -4,7 +4,6 @@
 # This software has been released under the terms of the IBM Public
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
-
 # */
 
 DESTDIR=@DESTDIR@
@@ -16,59 +15,50 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET = ${SRCDIR}bin/compile_et
-RXGEN=${SRCDIR}bin/rxgen
+COMPILE_ET = ${SRCDIR}/bin/compile_et
+RXGEN=${SRCDIR}/bin/rxgen
 
-CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 LDFLAGS = -g ${XLDFLAGS}
 INCLS= \
-       ${SRCDIR}include/lock.h \
-       ${SRCDIR}include/ubik.h \
-       ${SRCDIR}include/lwp.h \
-       ${SRCDIR}include/des.h \
-       ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h \
-       ${SRCDIR}include/rx/rxkad.h \
-       ${SRCDIR}include/afs/auth.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/afs/com_err.h \
-       ${SRCDIR}include/afs/bubasics.h \
+       ${SRCDIR}/include/lock.h \
+       ${SRCDIR}/include/ubik.h \
+       ${SRCDIR}/include/lwp.h \
+       ${SRCDIR}/include/des.h \
+       ${SRCDIR}/include/rx/rx.h \
+       ${SRCDIR}/include/rx/xdr.h \
+       ${SRCDIR}/include/rx/rxkad.h \
+       ${SRCDIR}/include/afs/auth.h \
+       ${SRCDIR}/include/afs/cellconfig.h \
+       ${SRCDIR}/include/afs/com_err.h \
+       ${SRCDIR}/include/afs/bubasics.h \
        budb.h budb_client.h database.h
 
 # library ordering defined by top level makefile
-LIBS= ${SRCDIR}lib/afs/libbubasics.a \
-       ${SRCDIR}lib/afs/libaudit.a \
-       ${SRCDIR}lib/afs/libprot.a \
-       ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a
-
-COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o \
-       ol_verify.o
-
-SERVER_OBJS = ${COMMON_OBJS} \
-       budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o procs.o server.o budb_errs.o
+LIBS= ${SRCDIR}/lib/afs/libbubasics.a \
+       ${SRCDIR}/lib/afs/libaudit.a \
+       ${SRCDIR}/lib/afs/libprot.a \
+       ${SRCDIR}/lib/afs/libkauth.a \
+       ${SRCDIR}/lib/libubik.a \
+       ${SRCDIR}/lib/afs/libauth.a \
+       ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/libdes.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/util.a
+
+COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o
+
+SERVER_OBJS = ${COMMON_OBJS} budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o \
+       procs.o server.o budb_errs.o
 
 LIB_BUDB_OBJS = budb_errs.o budb.cs.o budb.xdr.o struct_ops.o
 
-include ../config/Makefile.version
-
-noversion: install
-
-all: budb_server libbudb.a
-
-clean:
-       rm -f *.o *~ budb_errs.[ch] budb.h budb_client.h *.a *.xdr.c \
-               *.ss.c *.cs.c core budb_server AFS_component_version_number.c
+all: install
 
 budb_errs.o: budb_errs.c
 
@@ -86,10 +76,9 @@ db_text.o:  db_text.c budb_errs.h ${INCLS}
 db_hash.o: db_hash.c budb_errs.h ${INCLS}
 ol_verify.o:   ol_verify.c budb_errs.h ${INCLS}
 procs.o: procs.c budb_errs.h globals.h ${INCLS}
+struct_ops.o: budb_errs.h
 server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c
 
-# database verification and rebuild
-
 budb_server: $(SERVER_OBJS) ${LIBS}
        ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS}
 
@@ -101,20 +90,36 @@ libbudb.a: ${LIB_BUDB_OBJS} AFS_component_version_number.o
        ${AR} rv libbudb.a $(LIB_BUDB_OBJS) AFS_component_version_number.o
        ${RANLIB} libbudb.a
 
-system: install
-install: all ${DESTDIR}lib/afs/libbudb.a ${DESTDIR}include/afs/budb.h ${DESTDIR}include/afs/budb_errs.h ${DESTDIR}include/afs/budb_client.h ${DESTDIR}root.server/usr/afs/bin/buserver
+#
+# Install targets
+#
+
+install: ${DESTDIR}/lib/afs/libbudb.a \
+       ${DESTDIR}/include/afs/budb.h \
+       ${DESTDIR}/include/afs/budb_errs.h \
+       ${DESTDIR}/include/afs/budb_client.h \
+       ${DESTDIR}/root.server/usr/afs/bin/buserver
 
-${DESTDIR}lib/afs/libbudb.a: libbudb.a
-       ${INSTALL}  $? $@
+${DESTDIR}/lib/afs/libbudb.a: libbudb.a
+       ${INSTALL} $? $@
 
-${DESTDIR}include/afs/budb.h: budb.h
-       ${INSTALL}  $? $@
+${DESTDIR}/include/afs/budb.h: budb.h
+       ${INSTALL} $? $@
 
-${DESTDIR}include/afs/budb_errs.h: budb_errs.h
-       ${INSTALL}  $? $@
+${DESTDIR}/include/afs/budb_errs.h: budb_errs.h
+       ${INSTALL} $? $@
 
-${DESTDIR}include/afs/budb_client.h: budb_client.h
-       ${INSTALL}  $? $@
+${DESTDIR}/include/afs/budb_client.h: budb_client.h
+       ${INSTALL} $? $@
 
-${DESTDIR}root.server/usr/afs/bin/buserver: budb_server
+${DESTDIR}/root.server/usr/afs/bin/buserver: budb_server
        ${INSTALL} -f $? $@
+
+#
+# Misc targets
+#
+clean:
+       rm -f *.o *~ budb_errs.[ch] budb.h budb_client.h *.a *.xdr.c \
+               *.ss.c *.cs.c core budb_server AFS_component_version_number.c
+
+include ../config/Makefile.version
index 78e742e..f45e053 100644 (file)
@@ -16,55 +16,51 @@ include ../config/Makefile.${SYS_NAME}
 
 CFLAGS=-g -w ${INCDIRS} ${XCFLAGS}
 
-INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}include/afs \
-       -I${SRCDIR}include/rx -I${SRCDIR}include
+INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}/include/afs \
+       -I${SRCDIR}/include/rx -I${SRCDIR}/include
 
-INCLS=${SRCDIR}include/afs/partition.h ${SRCDIR}include/afs/volume.h \
-       ${SRCDIR}include/afs/vlserver.h ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h ${SRCDIR}include/afs/keys.h \
-       ${SRCDIR}include/afs/cellconfig.h ${SRCDIR}include/ubik.h \
-       ${SRCDIR}include/afs/cmd.h ${SRCDIR}include/afs/butc.h \
-       ${SRCDIR}include/afs/tcdata.h ${SRCDIR}include/afs/bubasics.h \
-       ${SRCDIR}include/afs/butm.h
+INCLS=${SRCDIR}/include/afs/partition.h ${SRCDIR}/include/afs/volume.h \
+       ${SRCDIR}/include/afs/vlserver.h ${SRCDIR}/include/rx/rx.h \
+       ${SRCDIR}/include/rx/xdr.h ${SRCDIR}/include/afs/keys.h \
+       ${SRCDIR}/include/afs/cellconfig.h ${SRCDIR}/include/ubik.h \
+       ${SRCDIR}/include/afs/cmd.h ${SRCDIR}/include/afs/butc.h \
+       ${SRCDIR}/include/afs/tcdata.h ${SRCDIR}/include/afs/bubasics.h \
+       ${SRCDIR}/include/afs/butm.h
 
-HACKS=${SRCDIR}lib/afs/libdir.a
+HACKS=${SRCDIR}/lib/afs/libdir.a
 
-INCLIBS=-L${SRCDIR}lib/afs -L${SRCDIR}lib
+INCLIBS=-L${SRCDIR}/lib/afs -L${SRCDIR}/lib
 
-LIBS=${SRCDIR}lib/afs/libbudb.a \
+LIBS=${SRCDIR}/lib/afs/libbudb.a \
        $(SRCDIR)/lib/afs/libbxdb.a \
-       ${SRCDIR}lib/afs/libbubasics.a \
-        ${SRCDIR}lib/afs/libbutm.a \
-       ${SRCDIR}lib/afs/libvolser.a \
-       ${SRCDIR}lib/afs/libvldb.a \
-        ${SRCDIR}lib/afs/vlib.a \
+       ${SRCDIR}/lib/afs/libbubasics.a \
+        ${SRCDIR}/lib/afs/libbutm.a \
+       ${SRCDIR}/lib/afs/libvolser.a \
+       ${SRCDIR}/lib/afs/libvldb.a \
+        ${SRCDIR}/lib/afs/vlib.a \
        ${SRCDIR}/lib/afs/libacl.a \
-        ${SRCDIR}lib/afs/libprot.a      \
-        ${SRCDIR}lib/afs/libkauth.a \
-        ${SRCDIR}lib/libubik.a \
-        ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-        ${SRCDIR}lib/afs/libsys.a  \
-        ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/librx.a \
-        ${SRCDIR}lib/afs/libsys.a  \
-       ${SRCDIR}lib/liblwp.a \
-        ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a \
-       ${SRCDIR}lib/afs/libusd.a \
-       ${SRCDIR}lib/afs/libprocmgmt.a
+        ${SRCDIR}/lib/afs/libprot.a      \
+        ${SRCDIR}/lib/afs/libkauth.a \
+        ${SRCDIR}/lib/libubik.a \
+        ${SRCDIR}/lib/afs/libauth.a \
+       ${SRCDIR}/lib/librxkad.a \
+        ${SRCDIR}/lib/afs/libsys.a  \
+        ${SRCDIR}/lib/libdes.a \
+       ${SRCDIR}/lib/librx.a \
+        ${SRCDIR}/lib/afs/libsys.a  \
+       ${SRCDIR}/lib/liblwp.a \
+        ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/util.a \
+       ${SRCDIR}/lib/afs/libusd.a \
+       ${SRCDIR}/lib/afs/libprocmgmt.a
 
 TESTOBJS=test.o
 
 SOBJS=dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o tcudbprocs.o \
        dump.o tcstatus.o
 
-include ../config/Makefile.version
-
-noversion: install
-
-all: butc read_tape
+all: install
 
 butc_test: ${TESTOBJS} ${LIBS} ${INCLS} ${HACKS}
        ${CC}  ${CFLAGS} ${TESTOBJS} ${LIBS} ${XLIBS} -o butc_test
@@ -91,30 +87,20 @@ tcstatus.o: tcstatus.c ${INCLS}
 
 read_tape: read_tape.c
        ${CC} ${CFLAGS} -o read_tape read_tape.c \
-               ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/util.a \
-               ${SRCDIR}lib/afs/libusd.a
-       ${INSTALL} read_tape ${SRCDIR}etc
+               ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/afs/util.a \
+               ${SRCDIR}/lib/afs/libusd.a
+       ${INSTALL} read_tape ${SRCDIR}/etc
 
 clean:
        rm -f butc *.o butc_test core tdump read_tape AFS_component_version_number.c
 
-system: install
-install install.noversion: all
+install: butc read_tape
        @case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|rs_aix4*|*linux*|hp_ux*) \
                echo "Don't install butc for ${SYS_NAME} (will install from tbutc)" ;; \
        *) \
-               echo ${INSTALL} butc ${DESTDIR}etc/butc ; \
-               ${INSTALL} butc ${DESTDIR}etc/butc ;; \
+               echo ${INSTALL} butc ${DESTDIR}/etc/butc ; \
+               ${INSTALL} butc ${DESTDIR}/etc/butc ;; \
        esac
 
-lint:  tcmain.c dbentries.c tcprocs.c test.c lwps.c list.c
-       lint -hb ${INCDIRS} ${INCLIBS} tcmain.c
-       lint -hb ${INCDIRS} ${INCLIBS} dbentries.c
-       lint -hb ${INCDIRS} ${INCLIBS} tcprocs.c
-       lint -hb ${INCDIRS} ${INCLIBS} lwps.c
-       lint -hb ${INCDIRS} ${INCLIBS} list.c
-       lint -hb ${INCDIRS} ${INCLIBS} test.c
-       lint -hb ${INCDIRS} ${INCLIBS} recoverDb.c
-       lint -hb ${INCDIRS} ${INCLIBS} tcudbprocs.c
+include ../config/Makefile.version
index f0a55b0..dc09fd8 100644 (file)
@@ -5,8 +5,6 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-# */
-
 DESTDIR=@DESTDIR@
 SRCDIR=@SRCDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
@@ -14,47 +12,44 @@ SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 
-CFLAGS = -g -w -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS = -g -w -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 LDFLAGS = -g ${XLDFLAGS}
-INCLS= ${SRCDIR}include/afs/com_err.h ${SRCDIR}include/afs/butm.h
-
-LIBS=${SRCDIR}lib/afs/libbubasics.a \
-${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libusd.a \
-${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/libbutm.a \
-${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a ${XLIBS}
-
-OBJS=file_tm.o 
+INCLS= ${SRCDIR}/include/afs/com_err.h ${SRCDIR}/include/afs/butm.h
 
+LIBS=${SRCDIR}/lib/afs/libbubasics.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/libusd.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/libbutm.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/util.a \
+       ${XLIBS}
 
 include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
 
-noversion: install
+all: install
 
-all: libbutm.a 
+install: ${DESTDIR}/lib/afs/libbutm.a
 
-clean:
-       rm -f *.o *.a core test_ftm AFS_component_version_number.c
+${DESTDIR}/lib/afs/libbutm.a: libbutm.a
+       ${INSTALL} $? $@
+
+libbutm.a: file_tm.o AFS_component_version_number.o
+       -rm -f libbutm.a
+       ${AR} rv libbutm.a file_tm.o AFS_component_version_number.o
+       ${RANLIB} libbutm.a
 
-file_tm.o: file_tm.c ${INCLS}
+file_tm.o: file_tm.c ${INCLS} AFS_component_version_number.c
 
 test_ftm.o: test_ftm.c ${INCLS} AFS_component_version_number.c
 
 test_ftm: test_ftm.o libbutm.a
        ${CC} ${LDFLAGS} -o test_ftm test_ftm.o libbutm.a ${LIBS}
 
-libbutm.a: ${OBJS} AFS_component_version_number.o
-       -rm -f libbutm.a
-       ${AR} rv libbutm.a $(OBJS) AFS_component_version_number.o
-       ${RANLIB} libbutm.a
-
-${DESTDIR}lib/afs/libbutm.a: libbutm.a
-       ${INSTALL}   $? $@
-
-system: install
-install install.noversion: all ${DESTDIR}lib/afs/libbutm.a
-
 test: test_ftm
        echo 'Usage: ./test_ftm -conf config -tape xxx *'
 
+clean:
+       rm -f *.o *.a core test_ftm AFS_component_version_number.c
 
+include ../config/Makefile.version
index ee22499..e86b0fa 100644 (file)
@@ -5,7 +5,6 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-# */
 DESTDIR=@DESTDIR@
 SRCDIR=@SRCDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
@@ -17,35 +16,25 @@ include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET = ${SRCDIR}bin/compile_et
 
-INCLS=cmd.h ${XINCLS}
 LIBOBJS=cmd_errors.o cmd.o 
 LIB64OBJS=cmd_errors64.o cmd64.o 
 
 CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
 
-include ../config/Makefile.version
-
-system install noversion: install.noversion
-
-all: libcmd.a
-
-test tests: 
-       (cd test; $(MAKE) )
+all: install
 
 cmd.h cmd_errors.c: cmd_errors.et cmd.p.h
-       rm -f cmd.h cmd_errors.c; ${COMPILE_ET} cmd_errors -h cmd
+       rm -f cmd.h cmd_errors.c
+       ${COMPILE_ET} cmd_errors -h cmd
 
 cmd_errors.o: cmd_errors.c
 
-cmd.o: cmd.c ${INCLS}
-
-AFS_component_version_number64.o: AFS_component_version_number.c
-       ${CC} ${OPTMZ} -I${SRCDIR}include ${XCFLAGS64} -c -o AFS_component_version_number64.o AFS_component_version_number.c
+cmd.o: cmd.c cmd.h
 
 cmd_errors64.o: cmd_errors.c
        ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c
 
-cmd64.o: cmd.c ${INCLS}
+cmd64.o: cmd.c cmd.h
        ${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -c -o cmd64.o cmd.c
 
 
@@ -59,19 +48,32 @@ libcmd.a: ${LIBOBJS} AFS_component_version_number.o
        $(AR) r libcmd.a ${LIBOBJS} AFS_component_version_number.o
        $(RANLIB) libcmd.a
 
-kinstall:
-       @echo No kernel source here.
+AFS_component_version_number64.o: AFS_component_version_number.c
+       ${CC} ${OPTMZ} -I${SRCDIR}include ${XCFLAGS64} -c -o AFS_component_version_number64.o AFS_component_version_number.c
+
+#
+# Install targets
+#
+install: ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/include/afs/cmd.h
+
+install64: install ${DESTDIR}/lib/afs/libcmd64.a
 
-ukinstall webinstall: install
+${DESTDIR}/include/afs/cmd.h: cmd.h
+       ${INSTALL} $? $@
 
-install64: libcmd64.a
-       ${INSTALL} libcmd64.a  ${DESTDIR}lib/afs/libcmd64.a
-       ${INSTALL} cmd.h ${DESTDIR}include/afs/cmd.h
+${DESTDIR}/lib/afs/libcmd.a: libcmd.a
+       ${INSTALL} $? $@
 
-install.noversion: all
-       ${INSTALL} libcmd.a ${DESTDIR}lib/afs/libcmd.a
-       ${INSTALL} cmd.h ${DESTDIR}include/afs/cmd.h
+${DESTDIR}/lib/afs/libcmd64.a: libcmd64.a
+       ${INSTALL} $? $@
+
+#
+# Misc targets
+#
+test tests: 
+       (cd test; $(MAKE) )
 
 clean:
        rm -f  *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c
 
+include ../config/Makefile.version
index ccae8f9..1a49e29 100644 (file)
@@ -16,10 +16,10 @@ SHELL = /bin/sh
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. L${BACKDIR}lib -L${BACKDIR}lib/afs
+LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. L${BACKDIR}/lib -L${BACKDIR}/lib/afs
 LIBS=-lcmd -lcom_err -lafsutil
 
-INCDIRS=  -I${SRCDIR}include -I${SRCDIR}include/afs -I.. -I${BACKDIR}include -I${BACKDIR}include/afs
+INCDIRS=  -I${SRCDIR}/include -I${SRCDIR}/include/afs -I.. -I${BACKDIR}/include -I${BACKDIR}/include/afs
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
 
index 07918f9..5347fdb 100644 (file)
@@ -3,9 +3,6 @@
 #
 # Copyright 1987, 1989 MIT Student Information Processing Board
 # For copyright info, see mit-sipb-cr.h.
-#
-#      $Locker$
-#
 
 DESTDIR=@DESTDIR@
 SRCDIR=@SRCDIR@
@@ -17,175 +14,99 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
-LINTFLAGS= -uhvpb
-LINTFILES= error_msg.c et_name.c com_err.c
-LIBOBJS= error_msg.o et_name.o com_err.o
-
 UKERNELDIR=../libuafs/
 
 CFLAGS= ${OPTMZ} -I${DESTDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
-FILES= Makefile et_name.c error_msg.c compile_et.c \
-               error_table.y et_lex.lex.l \
-               com_err.c com_err.h \
-               error_table.h mit-sipb-cr.h \
-               test.c test1.et test2.et \
-               compiler.h internal.h
-
-CFILES=        compile_et.c error_table.c error_msg.c et_name.c \
-       com_err.c
-
-UKSRCS=com_err.c com_err.h error_msg.c error_table.h mit-sipb-cr.h internal.h et_name.c
-
-
-include ../config/Makefile.version
-
-system noversion: install
 
-#
-# what to build...
-#
-${DESTDIR}bin/compile_et: compile_et
-       ${INSTALL} compile_et ${DESTDIR}bin/compile_et
-
-all:   libcom_err.a ${DESTDIR}bin/compile_et
+all: install
 
-lint:  llib-lcom_err.ln
+et_lex.lex.c: et_lex.lex.l
+       $(RM) -f et_lex.lex.c
+       $(LEX) -t et_lex.lex.l > et_lex.lex.c
 
-archive:       et.tar
+compile_et:    compile_et.o error_table.o
+       case $(SYS_NAME) in \
+       *_linux* ) \
+       ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil;; \
+       * ) \
+       ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil -ll;; \
+       esac
 
-doc:   com_err.dvi
+libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o
+       rm -f libcom_err.a
+       $(AR) cruv libcom_err.a error_msg.o et_name.o com_err.o AFS_component_version_number.o
+       $(RANLIB) libcom_err.a
 
 #
-# rules
+# Installation targets
 #
-.SUFFIXES: .l .h .c .et .ps .x9700 .mss .dvi .texinfo
+ukinstall: \
+       ${UKERNELDIR}/afs \
+       ${UKERNELDIR}/afs/com_err.c \
+       ${UKERNELDIR}/afs/com_err.h \
+       ${UKERNELDIR}/afs/error_msg.c \
+       ${UKERNELDIR}/afs/error_table.h \
+       ${UKERNELDIR}/afs/mit-sipb-cr.h \
+       ${UKERNELDIR}/afs/internal.h \
+       ${UKERNELDIR}/afs/et_name.c
 
-.l.c:
-       $(RM) -f $*.c
-       $(LEX) -t $*.l >$*.c
+install: ukinstall \
+       ${DESTDIR}/bin/compile_et \
+       ${DESTDIR}/include/afs/com_err.h \
+       ${DESTDIR}/include/afs/error_table.h \
+       ${DESTDIR}/include/afs/mit-sipb-cr.h \
+       ${DESTDIR}/lib/afs/libcom_err.a
 
-.et.c:
-       ./compile_et $*.et
+${UKERNELDIR}/afs:
+       set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED)
 
-.et.h:
-       ./compile_et $*.et
+${UKERNELDIR}/afs/com_err.c: com_err.c
+       ${INSTALL} $? $@
 
-.texinfo.dvi:
-       tex $<
+${UKERNELDIR}/afs/com_err.h: com_err.h
+       ${INSTALL} $? $@
 
-.dvi.ps:
-       rm -f $@.new
-       dvi2ps -r $< > $@.new
-       mv $@.new $@
+${UKERNELDIR}/afs/error_msg.c: error_msg.c
+       ${INSTALL} $? $@
 
-.c.o:
-#      ${CC} -c -pg ${CFLAGS} $*.c
-#      mv $*.o profiled/$*.o
-       ${CC} -c ${CFLAGS} $*.c
+${UKERNELDIR}/afs/error_table.h: error_table.h
+       ${INSTALL} $? $@
 
-#
-# real entries...
-#
-compile_et:    compile_et.o error_table.o
-       case $(SYS_NAME) in \
-       *_linux* ) \
-       ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil;; \
-       * ) \
-       ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${DESTDIR}/lib/afs -lafsutil -ll;; \
-       esac
+${UKERNELDIR}/afs/mit-sipb-cr.h: mit-sipb-cr.h
+       ${INSTALL} $? $@
 
-et.tar:        ${FILES}
-       rm -f et.tar
-       tar cfrlv et.tar ${FILES}
+${UKERNELDIR}/afs/internal.h: internal.h
+       ${INSTALL} $? $@
 
-tags:  TAGS
+${UKERNELDIR}/afs/et_name.c: et_name.c
+       ${INSTALL} $? $@
 
-kinstall:
-       @echo No $@ source here.
+${DESTDIR}/bin/compile_et: compile_et
+       ${INSTALL} $? $@
 
-ukinstall webinstall: install
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+${DESTDIR}/include/afs/com_err.h: com_err.h
+       ${INSTALL} $? $@
 
-install: all ukinstall
-       ${INSTALL} com_err.h ${DESTDIR}include/afs/com_err.h
-       ${INSTALL} error_table.h ${DESTDIR}include/afs/error_table.h
-       ${INSTALL} mit-sipb-cr.h ${DESTDIR}include/afs/mit-sipb-cr.h
-       ${INSTALL} libcom_err.a ${DESTDIR}lib/afs/libcom_err.a
+${DESTDIR}/include/afs/error_table.h: error_table.h 
+       ${INSTALL} $? $@
 
-TAGS:  et_name.c error_msg.c compile_et.c error_table.c \
-               lex.yy.c perror.c
-       etags et_name.c error_msg.c compile_et.c \
-               error_table.c perror.c
-
-libcom_err.a:  $(LIBOBJS) AFS_component_version_number.o
-       - rm -f libcom_err.a
-       $(AR) cruv libcom_err.a $(LIBOBJS) AFS_component_version_number.o
-       $(RANLIB) libcom_err.a
+${DESTDIR}/include/afs/mit-sipb-cr.h: mit-sipb-cr.h
+       ${INSTALL} $? $@
 
-llib-lcom_err.ln: $(LINTFILES)
-       lint -Ccom_err $(LINTFLAGS) $(LINTFILES)
+${DESTDIR}/lib/afs/libcom_err.a: libcom_err.a
+       ${INSTALL} $? $@
 
 clean:
-       -rm -f *~ \#* *.bak \
-               *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
-               *.cp *.fn *.ky *.log *.pg *.tp *.vr \
-               *.o libcom_err.a \
-               com_err.o compile_et \
-               et.ar TAGS y.tab.c lex.yy.c error_table.c \
-               et_lex.lex.c \
-               test1.h test1.c test2.h test2.c test \
-               eddep makedep core\
-               AFS_component_version_number.c
+       rm -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
+               *.cp *.fn *.ky *.log *.pg *.tp *.vr *.o libcom_err.a \
+               com_err.o compile_et et.ar TAGS y.tab.c lex.yy.c error_table.c \
+               et_lex.lex.c test1.h test1.c test2.h test2.c \
+               eddep makedep core AFS_component_version_number.c
 
 test:
        cd test; $(MAKE)
 
-# 'make depend' code
-depend: ${CFILES} et_lex.lex.c
-       rm -f eddep makedep
-       ${CC} -M ${CFLAGS} ${CFILES} | \
-       sed 's; ./; ;' | \
-       sed -e ':loop' \
-           -e 's/\.\.\/[^ /]*\/\.\./../' \
-           -e 't loop' > makedep
-       echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-       echo '$$r makedep' >>eddep
-       echo 'w' >>eddep
-       cp Makefile Makefile.bak
-       ed - Makefile < eddep
-       rm eddep makedep
-
 compile_et.o:  AFS_component_version_number.c
-#
-# the last line in the makefile should be...
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-compile_et.o: compile_et.c 
-compile_et.o: mit-sipb-cr.h
-error_table.o: error_table.c
-error_table.o: internal.h
-error_table.o: mit-sipb-cr.h
-error_table.o: error_table.h
-error_table.o: mit-sipb-cr.h
 error_table.o: et_lex.lex.c
-error_msg.o: error_msg.c
-error_msg.o: error_table.h
-error_msg.o: mit-sipb-cr.h
-error_msg.o: internal.h
-error_msg.o: mit-sipb-cr.h
-et_name.o: et_name.c
-et_name.o: error_table.h
-et_name.o: mit-sipb-cr.h
-et_name.o: internal.h
-et_name.o: mit-sipb-cr.h
-perror.o: perror.c
-perror.o: internal.h
-perror.o: mit-sipb-cr.h
-perror.o: com_err.h
-perror.o: mit-sipb-cr.h
-perror.o: mit-sipb-cr.h
-com_err.o: com_err.c
-com_err.o: error_table.h
-com_err.o: mit-sipb-cr.h
-com_err.o: internal.h
-com_err.o: mit-sipb-cr.h
+
+include ../config/Makefile.version
index 0da1e54..3b1063c 100644 (file)
@@ -8,8 +8,8 @@ SYS_NAME=@AFS_SYSNAME@
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include
+LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -L${BACKDIR}/lib -L${BACKDIR}/lib/afs
 LIBS= -lcom_err
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
index 7e9d5b1..634d52c 100644 (file)
@@ -43,5 +43,3 @@ RM=rm
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index f5843b6..39f3c1b 100644 (file)
@@ -43,5 +43,3 @@ RM=rm
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index 56435d3..a8e2245 100644 (file)
@@ -45,5 +45,3 @@ RM=rm
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index 3dae1eb..ea85232 100644 (file)
@@ -50,5 +50,3 @@ INSTALL=${DESTDIR}bin/install
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index 3de5076..6c3f055 100644 (file)
@@ -41,5 +41,3 @@ INSTALL=${DESTDIR}bin/install
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index 07925bf..f3d0084 100644 (file)
@@ -41,5 +41,3 @@ RM=rm
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index c64b724..d50e1f9 100644 (file)
@@ -42,5 +42,3 @@ INSTALL=${DESTDIR}bin/install
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index 9940046..2953d71 100644 (file)
@@ -46,5 +46,3 @@ INSTALL=${DESTDIR}bin/install
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index 1920d8c..7805f05 100644 (file)
@@ -46,5 +46,3 @@ INSTALL=${DESTDIR}bin/install
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index e1e515d..391139a 100644 (file)
@@ -45,5 +45,3 @@ INSTALL=${DESTDIR}bin/install
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index e1e515d..391139a 100644 (file)
@@ -45,5 +45,3 @@ INSTALL=${DESTDIR}bin/install
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index e1e515d..391139a 100644 (file)
@@ -45,5 +45,3 @@ INSTALL=${DESTDIR}bin/install
 #
 YACC = bison -y
 LEX = flex -l
-# Used in des library.
-CRYPT_OBJ = crypt.o
index bc039f9..5a36263 100644 (file)
@@ -13,6 +13,3 @@ AFS_component_version_number.o: AFS_component_version_number.c
 AFS_component_version_number.c: 
        echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c;
        echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>AFS_component_version_number.c;
-
-noversion: install
-
index 11708a3..f8e868a 100644 (file)
@@ -14,33 +14,33 @@ SHELL =     /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET =   ${SRCDIR}bin/compile_et
+COMPILE_ET =   ${SRCDIR}/bin/compile_et
 OPTMZ= -g
 
-CFLAGS =       ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS =       ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 LDFLAGS =      ${OPTMZ} ${XLDFLAGS}
 
-INCLS=         ${SRCDIR}include/ubik.h \
-               ${SRCDIR}include/lwp.h \
-               ${SRCDIR}include/lock.h  \
-               ${SRCDIR}include/rx/rx.h \
-               ${SRCDIR}include/rx/xdr.h \
-               ${SRCDIR}include/afs/com_err.h
+INCLS=         ${SRCDIR}/include/ubik.h \
+               ${SRCDIR}/include/lwp.h \
+               ${SRCDIR}/include/lock.h  \
+               ${SRCDIR}/include/rx/rx.h \
+               ${SRCDIR}/include/rx/xdr.h \
+               ${SRCDIR}/include/afs/com_err.h
 
 VERS = AFS_component_version_number.o
 OBJS =         adkint.cs.o adkint.xdr.o
 
-LIBS =                 ${SRCDIR}lib/afs/libkauth.a \
-               ${SRCDIR}lib/afs/libauth.a \
-               ${SRCDIR}lib/afs/libcmd.a \
-               ${SRCDIR}lib/afs/libcom_err.a \
-               ${SRCDIR}lib/libubik.a \
-               ${SRCDIR}lib/librxkad.a \
-               ${SRCDIR}lib/libdes.a \
-               ${SRCDIR}lib/librx.a \
-               ${SRCDIR}lib/liblwp.a \
-               ${SRCDIR}lib/afs/libsys.a \
-               ${SRCDIR}lib/afs/util.a 
+LIBS =                 ${SRCDIR}/lib/afs/libkauth.a \
+               ${SRCDIR}/lib/afs/libauth.a \
+               ${SRCDIR}/lib/afs/libcmd.a \
+               ${SRCDIR}/lib/afs/libcom_err.a \
+               ${SRCDIR}/lib/libubik.a \
+               ${SRCDIR}/lib/librxkad.a \
+               ${SRCDIR}/lib/libdes.a \
+               ${SRCDIR}/lib/librx.a \
+               ${SRCDIR}/lib/liblwp.a \
+               ${SRCDIR}/lib/afs/libsys.a \
+               ${SRCDIR}/lib/afs/util.a 
 
 CELL=          `pwd|awk -F/ '{print $$3}'`
 USNS=          cellname
@@ -60,7 +60,7 @@ 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
-               ${SRCDIR}bin/rxgen adkint.xg
+               ${SRCDIR}/bin/rxgen adkint.xg
 
 dlog:          dlog.o $(VERS) $(OBJS) $(LIBS)
                $(CC) ${LDFLAGS} -o dlog dlog.o $(VERS) $(OBJS) ${LIBS} \
@@ -78,11 +78,11 @@ dlog_test:  dlog.c $(OBJS) $(LIBS)
 
 system:        install
 
-${DESTDIR}bin/dlog: dlog
+${DESTDIR}/bin/dlog: dlog
        ${INSTALL}   $? $@
 
-${DESTDIR}bin/dpass: dpass
+${DESTDIR}/bin/dpass: dpass
        ${INSTALL}   $? $@
 
 
-install:       all ${DESTDIR}bin/dlog ${DESTDIR}bin/dpass
+install:       all ${DESTDIR}/bin/dlog ${DESTDIR}/bin/dpass
index 5a00a7d..c29d126 100644 (file)
@@ -31,117 +31,10 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR=../libuafs/
-SRC    =.
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
-
-UKSRCS=des.h mit-cpyright.h
-
-K_INC  = ${SRCDIR}include
-DBG    =
-GPROF  =
-# by default do not try to hide entry points
-F_CC   = -c ${GPROF} ${DBG} ${XCFLAGS}
-F_CPP  = -I${K_INC} -I. -I${TOP_SRCDIR}/config 
-MK_STR = "     \$${CC} -I\$${SRC} \$${F_CPP} \$${F_CC}" -I${TOP_SRCDIR}/config 
+
 LDFLAGS = ${XLDFLAGS}
 
-# dont use optimizer, since it pessimizes on uvax2,
-# somehow -pg makes it faster.
-
-TAGS   = /bin/ctags
-
-DES_LIB  = libdes.a
-DEP_LIBS = ${DES_LIB} ${NDES_LIB}
-LIBS    = ${DEP_LIBS} ${XLIBS}
-LLIB    = llib-ldes.ln
-
-SRCHOST        = \
-       ${SRC}/make_keyperm.c \
-       ${SRC}/make_ip.c \
-       ${SRC}/make_fp.c \
-       ${SRC}/make_p.c \
-       ${SRC}/make_s.c \
-       ${SRC}/make_s_table.c \
-       ${SRC}/make_p_table.c \
-       ${SRC}/make_odd.c \
-       ${SRC}/misc.c
-
-OBJHOST        = \
-       make_keyperm.o \
-       make_ip.o \
-       make_fp.o \
-       make_e.o \
-       make_p.o \
-       make_s.o \
-       make_s_table.o \
-       make_p_table.o \
-       make_odd.o \
-       misc.o
-
-SRCTARG        = \
-       ${SRC}/key_sched.c \
-       ${SRC}/des.c \
-       ${SRC}/cbc_encrypt.c \
-       ${SRC}/read_pssword.c \
-       ${SRC}/pcbc_encrypt.c \
-       ${SRC}/cksum.c \
-       ${SRC}/quad_cksum.c \
-       ${SRC}/new_rnd_key.c \
-       ${SRC}/key_parity.c \
-       ${SRC}/weak_key.c \
-       ${SRC}/util.c \
-       ${SRC}/strng_to_key.c \
-       ${SRC}/debug_decl.c
-
-OBJTARG        = \
-       key_sched.o \
-       des.o \
-       cbc_encrypt.o \
-       read_pssword.o \
-       pcbc_encrypt.o \
-       cksum.o \
-       quad_cksum.o \
-       key_parity.o \
-       weak_key.o \
-       new_rnd_key.o \
-       util.o \
-       strng_to_key.o \
-       debug_decl.o
-
-CFILES = ${SRCHOST} ${SRCTARG}
-OBJECTS        = ${OBJHOST} ${OBJTARG}
-
-CODE   = ${CFILES} ${SRC}/Makefile
-
-# Generated files
-GFILES = \
-       key_perm.h \
-       p_table.h \
-       s_table.h \
-       odd.h \
-       p.c \
-       s.c \
-       fp.c \
-       ip.c
-
-# Programs to create generated files
-GPROGS = \
-       make_keyperm \
-       make_p_table \
-       make_s_table \
-       make_odd \
-       make_p \
-       make_s \
-       make_fp \
-       make_ip
-
-XGPROGS = \
-       misc \
-       make_e
-
-# Library component lists.
-
-TARGOBJS = \
+OBJS = \
        des.o \
        cbc_encrypt.o \
        pcbc_encrypt.o \
@@ -154,288 +47,163 @@ TARGOBJS = \
        weak_key.o \
        read_pssword.o \
        strng_to_key.o \
-       misco.o \
-       ${CRYPT_OBJ} \
+       misc.o \
+       crypt.o \
        util.o
 
+all: install
 
-include ../config/Makefile.version
+#
+# Build rules
+#
+.c.o:
+       ${CC} -c -I. -I${SRCDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS} $<
 
-# This is required to get compiler flags, but not use CFLAGS.
-AFS_component_version_number.o: AFS_component_version_number.c
-       $(CC) ${XCFLAGS} -c AFS_component_version_number.c
+libdes.a: ${OBJS} AFS_component_version_number.o
+       rm -f libdes.a
+       ar r libdes.a ${OBJS} AFS_component_version_number.o
+       $(RANLIB) libdes.a
 
-noversion: install
+make_ip: make_ip.o misc.o main.o
+       ${CC} make_ip.o misc.o main.o ${LDFLAGS} -o make_ip
 
-all:   ${GFILES} ${CFILES} ${DEP_LIBS}
+make_fp: make_fp.o misc.o main.o
+       ${CC} make_fp.o misc.o main.o ${LDFLAGS} -o make_fp
 
-gprogs: ${GPROGS}
+make_odd: make_odd.o misc.o main.o
+       ${CC} make_odd.o misc.o main.o ${LDFLAGS} -o make_odd
 
-test: 
-       cd test; $(MAKE)
+make_s_table: make_s_table.o misc.o main.o 
+       ${CC} make_s_table.o misc.o main.o ${LDFLAGS} -o make_s_table
 
-system: install
+make_p_table: make_p_table.o misc.o main.o 
+       ${CC} make_p_table.o misc.o main.o ${LDFLAGS} -o make_p_table
 
-kinstall:
-       @echo No $@ source here.
+make_keyperm: make_keyperm.o misc.o main.o 
+       ${CC} make_keyperm.o misc.o main.o ${LDFLAGS} -o make_keyperm
 
-ukinstall webinstall: all ${UKSRCS}
-       set ${UKERNELDIR}des; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}des
-       ${INSTALL} libdes.a ${UKERNELDIR}des/libdes.a
+make_e:        make_e.o misc.o main.o 
+       ${CC} make_e.o misc.o main.o ${LDFLAGS} -o make_e
 
-${DESTDIR}lib/libdes.a: libdes.a
-       ${INSTALL} $? $@
+make_p:        make_p.o misc.o main.o 
+       ${CC} make_p.o misc.o main.o ${LDFLAGS} -o make_p
 
-install install.noversion: all ukinstall ${DESTDIR}lib/libdes.a
-       ${INSTALL} des.h des_conf.h mit-cpyright.h ${DESTDIR}include
-       ${INSTALL} odd.h ${DESTDIR}include/des_odd.h
+make_s:        make_s.o misc.o main.o 
+       ${CC} make_s.o misc.o main.o ${LDFLAGS} -o make_s
+
+#
+# Table/code generation targets
+#
+odd.h: make_odd
+       ./make_odd odd.h
 
-clean:
-       rm -f ${OBJECTS} ${DEP_LIBS} ${PROGS} ${GPROGS} ${GFILES} AFS_component_version_number.c misco.c
-       rm -f *.s *.o *.b core *~ *.com *.ld
-       rm -f tags TAGS ${LLIB}
-
-tags:  ${CFILES}
-       rm -f tags; ${TAGS} ${CFILES}
-
-print: ${CODE}
-       lpr -p ${CODE}
-
-src:   ${CODE}
-
-${CODE}:
-       (cd ${SRC}; co -q $@)
-
-lint:  ${LLIB}
-
-${LLIB}: ${CFILES}
-       lint -I${K_INC} ${CFILES}
-
-${DES_LIB}: ${TARGOBJS} ${COMMONOBJS} AFS_component_version_number.o
-       rm -f ${DES_LIB}
-       ar r ${DES_LIB} ${TARGOBJS} ${COMMONOBJS} AFS_component_version_number.o
-       $(RANLIB) ${DES_LIB}
-
-#      host system stuff
-make_ip: make_ip.o misc.o
-       ${CC} make_ip.o misc.o ${LDFLAGS} -o make_ip
-make_fp: make_fp.o misc.o
-       ${CC} make_fp.o misc.o ${LDFLAGS} -o make_fp
-make_odd: make_odd.o misc.o
-       ${CC} ${LDFLAGS} make_odd.o -o make_odd misc.o
-make_s_table: make_s_table.o misc.o    
-       ${CC} ${LDFLAGS} make_s_table.o misc.o -o make_s_table
-make_p_table: make_p_table.o misc.o    
-       ${CC} ${LDFLAGS} make_p_table.o misc.o -o make_p_table
-make_keyperm:  make_keyperm.o misc.o
-       ${CC} make_keyperm.o misc.o ${LDFLAGS} -o make_keyperm
-make_e:        make_e.o misc.o
-       ${CC} make_e.o misc.o ${LDFLAGS} -o make_e
-make_p:        make_p.o misc.o
-       ${CC} make_p.o misc.o ${LDFLAGS} -o make_p
-make_s:        make_s.o misc.o
-       ${CC} make_s.o misc.o ${LDFLAGS} -o make_s
-
-odd.h: make_odd
-       -./make_odd odd.h
 s_table.h: make_s_table
-       -./make_s_table s_table.h
+       ./make_s_table s_table.h
+
 p_table.h: make_p_table
-       -./make_p_table p_table.h
+       ./make_p_table p_table.h
+
 key_perm.h: make_keyperm
-       -./make_keyperm key_perm.h
-ip.c:  make_ip
-       -./make_ip ip.c
-p.c:   make_p
-       -./make_p p.c
-s.c:   make_s
-       -./make_s s.c
-fp.c:  make_fp
-       -./make_fp fp.c
-
-depend: ${CFILES} AFS_component_version_number.o
-       -${CC} -M ${F_CPP} ${CFILES} | \
-       sed -e ':loop' \
-       -e 't loop' | \
-       awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \
-       else { if (length(rec $$2) > 70) { print rec; rec = $$0; } \
-                  else rec = rec " " $$2 } } \
-         END { print rec } ' > makedep
-       for file in ${OBJECTS} ; do \
-       echo "$$file:" >> makedep; \
-       echo ${MK_STR} "\$${SRC}/`basename $$file .o`.c" >> makedep; \
-       done
-       echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-       echo '$$r makedep' >>eddep
-       echo 'w' >>eddep
-       cp Makefile Makefile.bak
-       ex - Makefile < eddep
-       rm eddep makedep
-       echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
-       echo -n '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
-       echo ' (see make depend above)' >> Makefile
-       make depend2 SRCDIR=${SRCDIR}
-
-depend2: ${CFILES} ${GFILES}
-       ${CC} -M ${F_CPP} ${CFILES} | \
-       sed -e ':loop' \
-       -e 't loop' | \
-       awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \
-       else { if (length(rec $$2) > 70) { print rec; rec = $$0; } \
-                  else rec = rec " " $$2 } } \
-         END { print rec } ' > makedep
-       for file in ${OBJECTS} ; do \
-       echo "$$file:" >> makedep; \
-       echo ${MK_STR} "\$${SRC}/`basename $$file .o`.c" >> makedep; \
-       done
-       echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-       echo '$$r makedep' >>eddep
-       echo 'w' >>eddep
-       cp Makefile Makefile.bak
-       ex - Makefile < eddep
-       rm eddep makedep
-       echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
-       echo -n '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
-       echo ' (see make depend above)' >> Makefile
-
-misc.o make_e.o: AFS_component_version_number.c
-# DO NOT DELETE THIS LINE
-
-make_keyperm.o: make_keyperm.c 
-make_keyperm.o: 
-make_ip.o: make_ip.c 
-make_ip.o: tables.h
-make_fp.o: make_fp.c 
-make_fp.o: tables.h
-make_p.o: make_p.c
-make_p.o: conf.h tables.h
-make_s.o: make_s.c ./s_table.h
-make_s_table.o: make_s_table.c
-make_s_table.o: tables.h
-make_p_table.o: make_p_table.c 
-make_p_table.o: conf.h
-make_p_table.o: tables.h
-make_odd.o: make_odd.c 
-misc.o: misc.c des_internal.h
-misc.o: conf.h
-key_sched.o: key_sched.c
-key_sched.o: conf.h 
-key_sched.o: des.h des_internal.h
-key_sched.o: mit-cpyright.h
-key_sched.o: des_conf.h ./key_perm.h ./odd.h
-key_test.o: key_test.c
-key_test.o: des.h
-key_test.o: mit-cpyright.h
-key_test.o: des_conf.h
-testit.o: testit.c
-testit.o: des.h
-testit.o: mit-cpyright.h
-testit.o: des_conf.h
-des.o: des.c des_internal.h
-des.o: des.h
-des.o: mit-cpyright.h
-des.o: des_conf.h ./s_table.h ./p_table.h ./ip.c
-des.o: ./p.c ./fp.c
-cbc_encrypt.o: cbc_encrypt.c 
-cbc_encrypt.o: des.h
-cbc_encrypt.o: mit-cpyright.h
-cbc_encrypt.o: des_conf.h
-verify.o: verify.c 
-verify.o: des.h
-verify.o: mit-cpyright.h
-verify.o: des_conf.h
-read_pssword.o: read_pssword.c
-read_pssword.o: des.h
-read_pssword.o: mit-cpyright.h
-read_pssword.o: des_conf.h 
-pcbc_encrypt.o: pcbc_encrypt.c
-pcbc_encrypt.o: des.h des_internal.h
-pcbc_encrypt.o: mit-cpyright.h
-pcbc_encrypt.o: des_conf.h
-cksum.o: des.h
-cksum.o: mit-cpyright.h
-cksum.o: des_conf.h
-quad_cksum.o: quad_cksum.c 
-quad_cksum.o: des.h
-quad_cksum.o: mit-cpyright.h
-quad_cksum.o: des_conf.h
-#random_key.o: random_key.c 
-#random_key.o: des.h
-#random_key.o: mit-cpyright.h
-#random_key.o: des_conf.h 
-key_parity.o: key_parity.c des.h odd.h
-weak_key.o: weak_key.c des.h des_internal.h
-new_rnd_key.o: des.h des_internal.h 
-util.o: util.c
-util.o: des.h
-util.o: mit-cpyright.h
-util.o: des_conf.h
-strng_to_key.o: strng_to_key.c 
-strng_to_key.o: des.h
-strng_to_key.o: mit-cpyright.h
-strng_to_key.o: des_conf.h ./odd.h
-debug_decl.o: debug_decl.c
-make_e.o: make_e.c
-make_keyperm.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_keyperm.c
-make_ip.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_ip.c
-make_fp.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_fp.c
-make_p.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_p.c
-make_s.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_s.c
-make_s_table.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_s_table.c
-make_p_table.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_p_table.c
-make_odd.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_odd.c
-misc.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/misc.c
-misco.c: misc.c
-       -ln -s misc.c misco.c
-misco.o: misco.c
-        ${CC} -I${SRC} ${F_CPP} ${F_CC} -o misco.o misco.c -DDONT_INCL_MAIN
-key_sched.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/key_sched.c
-key_test.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/key_test.c
-testit.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/testit.c
-crypt.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/crypt.c
-des.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/des.c
-cbc_encrypt.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/cbc_encrypt.c
-verify.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/verify.c
-read_pssword.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/read_pssword.c
-pcbc_encrypt.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/pcbc_encrypt.c
-cksum.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/cksum.c
-quad_cksum.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/quad_cksum.c
-#random_key.o:
-#      ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/random_key.c
-key_parity.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/key_parity.c
-weak_key.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/weak_key.c
-new_rnd_key.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/new_rnd_key.c
-util.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/util.c
-strng_to_key.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/strng_to_key.c
-debug_decl.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/debug_decl.c
-make_e.o:
-       ${CC} -I${SRC} ${F_CPP} ${F_CC} ${SRC}/make_e.c
-# DEPENDENCIES MUST END AT END OF FILE
-# IF YOU PUT STUFF HERE IT WILL GO AWAY (see make depend above)
+       ./make_keyperm key_perm.h
+
+ip.c: make_ip
+       ./make_ip ip.c
+
+p.c: make_p
+       ./make_p p.c
+
+s.c: make_s
+       ./make_s s.c
+
+fp.c: make_fp
+       ./make_fp fp.c
+
+#
+# Dependency rules
+#
+INCLS=des.h mit-cpyright.h des_conf.h des_internal.h conf.h
+
+make_keyperm.o: make_keyperm.c ${INCLS}
+make_ip.o: make_ip.c tables.h ${INCLS}
+make_fp.o: make_fp.c tables.h ${INCLS}
+make_p.o: make_p.c tables.h ${INCLS}
+make_s.o: make_s.c s_table.h ${INCLS}
+make_s_table.o: make_s_table.c tables.h ${INCLS}
+make_p_table.o: make_p_table.c tables.h ${INCLS}
+make_odd.o: make_odd.c ${INCLS}
+misc.o: misc.c AFS_component_version_number.c ${INCLS}
+main.o: main.c AFS_component_version_number.c ${INCLS}
+key_sched.o: key_sched.c key_perm.h odd.h ${INCLS}
+key_test.o: key_test.c ${INCLS}
+testit.o: testit.c ${INCLS}
+des.o: s_table.h p_table.h ip.c p.c fp.c ${INCLS}
+cbc_encrypt.o: cbc_encrypt.c ${INCLS}
+verify.o: verify.c ${INCLS}
+read_pssword.o: read_pssword.c ${INCLS}
+pcbc_encrypt.o: pcbc_encrypt.c ${INCLS}
+cksum.o: cksum.c ${INCLS}
+quad_cksum.o: quad_cksum.c ${INCLS}
+key_parity.o: key_parity.c odd.h ${INCLS}
+weak_key.o: weak_key.c ${INCLS}
+new_rnd_key.o: new_rnd_key.c ${INCLS}
+util.o: util.c ${INCLS}
+strng_to_key.o: strng_to_key.c ${INCLS}
+debug_decl.o: debug_decl.c ${INCLS}
+make_e.o: make_e.c ${INCLS}
+
+#
+# Install targets
+#
+install: ukinstall\
+       ${DESTDIR}/lib/libdes.a \
+       ${DESTDIR}/include/des.h \
+       ${DESTDIR}/include/des_conf.h \
+       ${DESTDIR}/include/mit-cpyright.h \
+       ${DESTDIR}/include/des_odd.h
+
+${DESTDIR}/lib/libdes.a: libdes.a
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/des.h: des.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/des_conf.h: des_conf.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/mit-cpyright.h: mit-cpyright.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/des_odd.h: odd.h
+       ${INSTALL} $? $@
+
+ukinstall: \
+       ${UKERNELDIR}/des/libdes.a \
+       ${UKERNELDIR}/des/des.h \
+       ${UKERNELDIR}/des/mit-cpyright.h 
+       
+${UKERNELDIR}/des:
+       mkdir -p $?
+
+${UKERNELDIR}/des/libdes.a: libdes.a
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/des/des.h: des.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/des/mit-cpyright.h: mit-cpyright.h
+       ${INSTALL} $? $@
+
+#
+# Misc. targets
+#
+test: libdes.a
+       cd test; $(MAKE)
+
+clean:
+       rm -f *.a *.s *.o *.b core *~ *.com *.ld
+       rm -f make_fp make_ip make_keyperm make_odd make_p \
+               make_p_table make_s_table key_perm.h p_table.h \
+               s_table.h odd.h p.c s.c fp.c ip.c AFS_component_version_number.c
+
+include ../config/Makefile.version
+
diff --git a/src/des/main.c b/src/des/main.c
new file mode 100644 (file)
index 0000000..b0b7c4e
--- /dev/null
@@ -0,0 +1,87 @@
+/*
+ * Copyright 1988 by the Massachusetts Institute of Technology.
+ *
+ * For copying and distribution information,
+ * please seethe file <mit-cpyright.h>.
+ *
+ * This file contains most of the routines needed by the various
+ * make_foo programs, to account for bit- and byte-ordering on
+ * different machine types.  It also contains other routines useful in
+ * generating the intermediate source files.
+ */
+
+#include <afsconfig.h>
+#include <afs/param.h>
+
+RCSID("$Header$");
+
+#include <mit-cpyright.h>
+#include <stdio.h>
+#include "des_internal.h"
+
+extern void gen PROTOTYPE((FILE * stream));
+extern int des_debug;
+char const *whoami;
+
+#ifndef DONT_INCL_MAIN
+
+#include "AFS_component_version_number.c"
+
+int main(argc, argv)
+    int argc;
+    char *argv[];
+{
+    char *filename;
+    char *arg;
+    FILE * stream;
+
+    whoami = argv[0];
+    filename = (char *)NULL;
+
+    while (argc--, *++argv) {
+        arg = *argv;
+        if (*arg == '-') {
+            if (!strcmp(arg, "-d") && !strcmp(arg, "-debug"))
+                des_debug++;
+            else {
+                fprintf(stderr, "%s: unknown control argument %s\n",
+                        whoami, arg);
+                goto usage;
+            }
+        }
+        else if (filename) {
+            fprintf(stderr,
+                    "%s: multiple file names provided: %s, %s\n",
+                    whoami, filename, arg);
+            goto usage;
+        }
+        else
+            filename = arg;
+    }
+
+    if (!filename) {
+        fprintf(stderr, "%s: no file name provided\n", whoami);
+        goto usage;
+    }
+
+    stream = fopen(filename, "w");
+    if (!stream) {
+        perror(filename);
+    usage:
+        fprintf(stderr, "usage: %s [-debug] filename\n", whoami);
+        exit(1);
+    }
+
+    fputs(
+      "/* This file is automatically generated.  Do not edit it. */\n",
+          stream);
+
+    /* This routine will generate the contents of the file. */
+    gen(stream);
+    if (fclose(stream) == EOF) {
+        perror(filename);
+        exit(1);
+    }
+    exit(0);
+}
+#endif /* DONT_INCL_MAIN */
index 2d18217..b56ccd6 100644 (file)
@@ -19,6 +19,8 @@ RCSID("$Header$");
 #include <stdio.h>
 #include "des_internal.h"
 
+int des_debug;
+
 /*
  * The DES algorithm is defined in terms of MSBFIRST, so sometimes,
  * e.g.  VAXes, we need to fix it up.  ANSI order means the DES
@@ -286,70 +288,3 @@ void test_set(stream, src, testbit, dest, setbit)
 #endif
 }
 
-extern void gen PROTOTYPE((FILE * stream));
-int des_debug;
-char const *whoami;
-
-
-#ifndef DONT_INCL_MAIN
-
-#include "AFS_component_version_number.c"
-
-int main(argc, argv)
-    int argc;
-    char *argv[];
-{
-    char *filename;
-    char *arg;
-    FILE * stream;
-
-    whoami = argv[0];
-    filename = (char *)NULL;
-
-    while (argc--, *++argv) {
-        arg = *argv;
-        if (*arg == '-') {
-            if (!strcmp(arg, "-d") && !strcmp(arg, "-debug"))
-                des_debug++;
-            else {
-                fprintf(stderr, "%s: unknown control argument %s\n",
-                        whoami, arg);
-                goto usage;
-            }
-        }
-        else if (filename) {
-            fprintf(stderr,
-                    "%s: multiple file names provided: %s, %s\n",
-                    whoami, filename, arg);
-            goto usage;
-        }
-        else
-            filename = arg;
-    }
-
-    if (!filename) {
-        fprintf(stderr, "%s: no file name provided\n", whoami);
-        goto usage;
-    }
-
-    stream = fopen(filename, "w");
-    if (!stream) {
-        perror(filename);
-    usage:
-        fprintf(stderr, "usage: %s [-debug] filename\n", whoami);
-        exit(1);
-    }
-
-    fputs(
-      "/* This file is automatically generated.  Do not edit it. */\n",
-          stream);
-
-    /* This routine will generate the contents of the file. */
-    gen(stream);
-    if (fclose(stream) == EOF) {
-        perror(filename);
-        exit(1);
-    }
-    exit(0);
-}
-#endif /* DONT_INCL_MAIN */
index 6356801..59b3459 100644 (file)
@@ -4,35 +4,34 @@ SRCDIR=@SRCDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
+SHELL = /bin/sh
+include ../../config/Makefile.${SYS_NAME}
 
 
-BACKDIR=../../../../PARENT/dest/
-OPTIMIZE=-O
-CC     = cc
 #  Test programs
-PROGS  = \
+PROGS = \
        key_test \
        testit \
        verify
 
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
-LIBS= -ldes
-
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I.. 
+LIBS=-L.. -ldes
+CFLAGS = ${INCDIRS} ${XCFLAGS}
 
 all system test: $(PROGS)
 
 clean:
        rm -f *.o *.a testit verify key_test core
 
+install:
+
 kinstall:
        @echo No kernel source here.
 
 testit: testit.o 
-       ${CC} ${CFLAGS} testit.o -o testit
-verify: verify.o libdes.a
-       ${CC} ${CFLAGS} verify.o -o verify
-key_test: key_test.o libdes.a
-       ${CC}  ${CFLAGS} key_test.o -o key_test
+       ${CC} ${CFLAGS} testit.o ${LIBS} -o testit
+verify: verify.o ../libdes.a
+       ${CC} ${CFLAGS} verify.o ${LIBS} -o verify
+key_test: key_test.o ../libdes.a
+       ${CC}  ${CFLAGS} key_test.o ${LIBS} -o key_test
 
index 0b69de2..7c850bf 100644 (file)
@@ -20,7 +20,7 @@ RM     = /bin/rm
 UKERNELDIR=../libuafs/
 SRC    =.
 DESPAR =../../../DESLIB/dest/
-DESINC =${DESPAR}include/
+DESINC =${DESPAR}/include/
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 all:
 
@@ -31,16 +31,13 @@ ukinstall webinstall: ${DESINC}des.h ${DESINC}mit-cpyright.h
        set ${UKERNELDIR}des; $(MKDIR_IF_NEEDED)
        ${INSTALL} ${DESINC}des.h ${UKERNELDIR}des/des.h
        ${INSTALL} ${DESINC}mit-cpyright.h ${UKERNELDIR}des/mit-cpyright.h
-       ${INSTALL} ${DESPAR}lib/libdes.a ${UKERNELDIR}des/libdes.a
+       ${INSTALL} ${DESPAR}/lib/libdes.a ${UKERNELDIR}des/libdes.a
 
 install install.noversion noversion system: ukinstall
        echo "Installing des stubs from ${DESPAR}:" `cd ${DESPAR};/bin/pwd`
-       ${RM} -f ${DESTDIR}lib/libdes.a
-       ${INSTALL} ${DESPAR}lib/libdes.a ${DESTDIR}lib/libdes.a
-       ${INSTALL} ${DESINC}des.h ${DESINC}des_conf.h ${DESINC}mit-cpyright.h ${DESTDIR}include
-       ${INSTALL} ${DESINC}des_odd.h ${DESTDIR}include/des_odd.h
+       ${RM} -f ${DESTDIR}/lib/libdes.a
+       ${INSTALL} ${DESPAR}/lib/libdes.a ${DESTDIR}/lib/libdes.a
+       ${INSTALL} ${DESINC}des.h ${DESINC}des_conf.h ${DESINC}mit-cpyright.h ${DESTDIR}/include
+       ${INSTALL} ${DESINC}des_odd.h ${DESTDIR}/include/des_odd.h
 
 clean:
-
-lint:
-
index 41f186f..c8fa306 100644 (file)
@@ -18,7 +18,7 @@ KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
-INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XINCLS}
+INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include ${XINCLS}
 CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS}
 
 OBJS=buffer.o dir.o salvage.o
@@ -36,17 +36,17 @@ libdir.a: ${OBJS} AFS_component_version_number.o
        $(RANLIB) libdir.a
 
 kinstall:
-       ${INSTALL} dir.h ${KERNELDIR}afs
-       ${INSTALL} dir.c ${KERNELDIR}afs/afs_dir.c
+       ${INSTALL} dir.h ${KERNELDIR}/afs
+       ${INSTALL} dir.c ${KERNELDIR}/afs/afs_dir.c
 
 ukinstall webinstall:
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} dir.h ${UKERNELDIR}afs
-       ${INSTALL} dir.c ${UKERNELDIR}afs/afs_dir.c
+       set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED)
+       ${INSTALL} dir.h ${UKERNELDIR}/afs
+       ${INSTALL} dir.c ${UKERNELDIR}/afs/afs_dir.c
 
 install:       all kinstall ukinstall
-       ${INSTALL} libdir.a ${DESTDIR}lib/afs
-       ${INSTALL} dir.h ${DESTDIR}include/afs
+       ${INSTALL} libdir.a ${DESTDIR}/lib/afs
+       ${INSTALL} dir.h ${DESTDIR}/include/afs
 
 test: 
        (cd test; $(MAKE) )
@@ -57,12 +57,5 @@ dir.o: dir.c dir.h
 
 salvage.o: salvage.c dir.h
 
-#doc:
-#      ${INSTALL} -m 644 dir.vdoc ${DESTDIR}doc/vdoc
-
 clean:
        rm -f *.o *.a core AFS_component_version_number.c
-
-beancount:
-       wc -l *.c *.h
-
index d596972..f79b993 100644 (file)
@@ -15,10 +15,10 @@ SHELL = /bin/sh
 include ../../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
-INSTALL = ${SRCDIR}bin/install
+INSTALL = ${SRCDIR}/bin/install
 
-INCDIRS= -I${DESTDIR}include ${XINCLS}
-LIBS = ${SRCDIR}lib/afs/libdir.a ${SRCDIR}lib/afs/util.a 
+INCDIRS= -I${DESTDIR}/include ${XINCLS}
+LIBS = ${SRCDIR}/lib/afs/libdir.a ${SRCDIR}/lib/afs/util.a 
 CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS}
 
 OBJS=test-salvage.o physio.o dtest.o
index f02fe4c..16cc6a9 100644 (file)
@@ -20,7 +20,7 @@ include ../config/Makefile.${SYS_NAME}
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
      DEFS =
-     INCS = -I${TOP_SRCDIR}/config -I${SRCDIR}include
+     INCS = -I${TOP_SRCDIR}/config -I${SRCDIR}/include
    CFLAGS = ${OPTMZ} ${DEFS} ${INCS}
   EXPORTS = -bexport:export.exp
   IMPORTS = /lib/kernex.exp /lib/syscalls.exp extras.exp
@@ -35,15 +35,15 @@ noversion system: install
 install: all kinstall ukinstall
        ${INSTALL} export.ext ${DESTDIR}root.client/usr/vice/etc/dkload
        ${INSTALL} export.ext.nonfs ${DESTDIR}root.client/usr/vice/etc/dkload
-       ${INSTALL} export.exp ${DESTDIR}lib/afs/export.exp
-       ${INSTALL} extras.exp ${DESTDIR}lib/afs/extras.exp
+       ${INSTALL} export.exp ${DESTDIR}/lib/afs/export.exp
+       ${INSTALL} extras.exp ${DESTDIR}/lib/afs/extras.exp
        ${INSTALL} cfgexport  ${DESTDIR}root.client/usr/vice/etc/dkload/cfgexport
        ${INSTALL} cfgafs     ${DESTDIR}root.client/usr/vice/etc/dkload/cfgafs
 
 kinstall:
-       ${INSTALL} export.h ${DESTDIR}include
+       ${INSTALL} export.h ${DESTDIR}/include
        ${INSTALL} export.h ../libafs
-       ${INSTALL} export.exp ${DESTDIR}lib
+       ${INSTALL} export.exp ${DESTDIR}/lib
        ${INSTALL} export.exp ../libafs
 
 ukinstall webinstall:
index 4da24c3..f767917 100644 (file)
@@ -15,38 +15,38 @@ SYS_NAME=@AFS_SYSNAME@
 SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
-CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS = -g -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 LDFLAGS = -g ${XLDFLAGS}
-INCLS=${SRCDIR}include/ubik.h \
-       ${SRCDIR}include/lwp.h \
-       ${SRCDIR}include/lock.h  \
-       ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h \
-       ${SRCDIR}include/rx/rxkad.h \
-       ${SRCDIR}include/afs/com_err.h \
-       ${SRCDIR}include/afs/auth.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/afs/cmd.h \
-       ${SRCDIR}include/afs/pterror.h \
-       ${SRCDIR}include/afs/kautils.h \
-       ${SRCDIR}include/afs/bnode.h \
-       ${SRCDIR}include/afs/vlserver.h
+INCLS=${SRCDIR}/include/ubik.h \
+       ${SRCDIR}/include/lwp.h \
+       ${SRCDIR}/include/lock.h  \
+       ${SRCDIR}/include/rx/rx.h \
+       ${SRCDIR}/include/rx/xdr.h \
+       ${SRCDIR}/include/rx/rxkad.h \
+       ${SRCDIR}/include/afs/com_err.h \
+       ${SRCDIR}/include/afs/auth.h \
+       ${SRCDIR}/include/afs/cellconfig.h \
+       ${SRCDIR}/include/afs/cmd.h \
+       ${SRCDIR}/include/afs/pterror.h \
+       ${SRCDIR}/include/afs/kautils.h \
+       ${SRCDIR}/include/afs/bnode.h \
+       ${SRCDIR}/include/afs/vlserver.h
 
-LIBS=${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/libvldb.a \
-       ${SRCDIR}lib/afs/libbos.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/libvolser.a \
-       ${SRCDIR}lib/afs/util.a \
-       ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libprot.a \
-       ${SRCDIR}lib/libdes.a \
+LIBS=${SRCDIR}/lib/libubik.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/libauth.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/afs/libvldb.a \
+       ${SRCDIR}/lib/afs/libbos.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/libvolser.a \
+       ${SRCDIR}/lib/afs/util.a \
+       ${SRCDIR}/lib/afs/libkauth.a \
+       ${SRCDIR}/lib/afs/libprot.a \
+       ${SRCDIR}/lib/libdes.a \
        ${XLIBS}
 
 include ../config/Makefile.version
@@ -78,4 +78,4 @@ test: translate_et
 system: install
 
 noversion install.noversion install: all
-       ${INSTALL} translate_et ${DESTDIR}bin/translate_et
+       ${INSTALL} translate_et ${DESTDIR}/bin/translate_et
index 46f75c9..c046570 100644 (file)
@@ -18,7 +18,7 @@ UKERNELDIR = ../libuafs/
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o
-CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 KDSRCS=Kcallback.ss.c Kcallback.h Kvice.cs.c Kvice.h Kvice.xdr.c afscbint.h \
 afsint.h
 KSRCS=${KDSRCS} afsaux.c
@@ -39,73 +39,73 @@ 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 $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -C -o Kcallback.cs.c afscbint.xg
+       ${SRCDIR}/bin/rxgen -x -k -C -o Kcallback.cs.c afscbint.xg
 
 Kcallback.ss.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -S -o Kcallback.ss.c afscbint.xg
+       ${SRCDIR}/bin/rxgen -x -k -S -o Kcallback.ss.c afscbint.xg
 
 Kcallback.xdr.c: common.xg afscbint.xg Kvice.h Kcallback.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -y -c -o Kcallback.xdr.c afscbint.xg
+       ${SRCDIR}/bin/rxgen -x -k -y -c -o Kcallback.xdr.c afscbint.xg
 
 Kvice.cs.c: common.xg afsint.xg Kvice.h  $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -C -o Kvice.cs.c afsint.xg
+       ${SRCDIR}/bin/rxgen -x -k -C -o Kvice.cs.c afsint.xg
 
 Kvice.ss.c: common.xg afsint.xg Kvice.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -S -o Kvice.ss.c afsint.xg
+       ${SRCDIR}/bin/rxgen -x -k -S -o Kvice.ss.c afsint.xg
 
 Kvice.xdr.c: common.xg afsint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -c -o Kvice.xdr.c afsint.xg
+       ${SRCDIR}/bin/rxgen -x -k -c -o Kvice.xdr.c afsint.xg
 
 Kvice.h: common.xg afsint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -h -o Kvice.h afsint.xg
+       ${SRCDIR}/bin/rxgen -x -k -h -o Kvice.h afsint.xg
 
 Kcallback.h: common.xg afscbint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -k -h -o Kcallback.h afscbint.xg
+       ${SRCDIR}/bin/rxgen -x -k -h -o Kcallback.h afscbint.xg
 
 afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -C -o afscbint.cs.c afscbint.xg
+       ${SRCDIR}/bin/rxgen -x -C -o afscbint.cs.c afscbint.xg
 
 afscbint.ss.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -S -o afscbint.ss.c afscbint.xg
+       ${SRCDIR}/bin/rxgen -x -S -o afscbint.ss.c afscbint.xg
 
 afscbint.xdr.c: common.xg afscbint.xg afsint.h afscbint.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -y -c -o afscbint.xdr.c afscbint.xg
+       ${SRCDIR}/bin/rxgen -x -y -c -o afscbint.xdr.c afscbint.xg
 
 afsint.cs.c: common.xg afsint.xg afsint.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -C -o afsint.cs.c afsint.xg
+       ${SRCDIR}/bin/rxgen -x -C -o afsint.cs.c afsint.xg
 
 afsint.ss.c: common.xg afsint.xg afsint.h $(UTILS)
-       ${SRCDIR}bin/rxgen -x -S -o afsint.ss.c afsint.xg
+       ${SRCDIR}/bin/rxgen -x -S -o afsint.ss.c afsint.xg
 
 afsint.xdr.c: common.xg afsint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -c -o afsint.xdr.c afsint.xg
+       ${SRCDIR}/bin/rxgen -x -c -o afsint.xdr.c afsint.xg
 
 afsint.h: common.xg afsint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -h -o afsint.h afsint.xg
+       ${SRCDIR}/bin/rxgen -x -h -o afsint.h afsint.xg
 
 afscbint.h: common.xg afscbint.xg $(UTILS)
-       ${SRCDIR}bin/rxgen -x -h -o afscbint.h afscbint.xg
+       ${SRCDIR}/bin/rxgen -x -h -o afscbint.h afscbint.xg
 
 system: install
 
 kinstall: ${KSRCS}
-       set ${KERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} $(KSRCS) ${KERNELDIR}afsint
-       ${INSTALL} $(SRCDIR)include/afs/rxgen_consts.h ${KERNELDIR}afsint
-       -${INSTALL} ${KERNELDIR}rx/rx.h ${KERNELDIR}afsint/rx.h
-       ${INSTALL} afscbint.h ${KERNELDIR}afs
+       set ${KERNELDIR}/afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} $(KSRCS) ${KERNELDIR}/afsint
+       ${INSTALL} $(SRCDIR)include/afs/rxgen_consts.h ${KERNELDIR}/afsint
+       -${INSTALL} ${KERNELDIR}rx/rx.h ${KERNELDIR}/afsint/rx.h
+       ${INSTALL} afscbint.h ${KERNELDIR}/afs
 
 ukinstall webinstall: ${UKSRCS}
-       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} $(UKSRCS) ${UKERNELDIR}afsint
-       ${INSTALL} $(SRCDIR)include/afs/rxgen_consts.h ${UKERNELDIR}afsint
-       -${INSTALL} ${UKERNELDIR}rx/rx.h ${UKERNELDIR}afsint/rx.h
-       ${INSTALL} afscbint.h ${UKERNELDIR}afs
+       set ${UKERNELDIR}/afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} $(UKSRCS) ${UKERNELDIR}/afsint
+       ${INSTALL} $(SRCDIR)include/afs/rxgen_consts.h ${UKERNELDIR}/afsint
+       -${INSTALL} ${UKERNELDIR}rx/rx.h ${UKERNELDIR}/afsint/rx.h
+       ${INSTALL} afscbint.h ${UKERNELDIR}/afs
 
 install:  all  kinstall ukinstall
-       ${INSTALL} libafsint.a ${DESTDIR}lib/afs
-       ${INSTALL} afsint.h ${DESTDIR}include/afs
-       ${INSTALL} afscbint.h ${DESTDIR}include/afs
+       ${INSTALL} libafsint.a ${DESTDIR}/lib/afs
+       ${INSTALL} afsint.h ${DESTDIR}/include/afs
+       ${INSTALL} afscbint.h ${DESTDIR}/include/afs
 
 clean:
        rm -f *.o *.cs.c *.ss.c *.er.c afsint.h afsint.xdr.c libafsint.a $(KDSRCS) core AFS_component_version_number.c afscbint.xdr.c
index 4f05bb1..c1220d5 100644 (file)
@@ -19,40 +19,36 @@ include ../config/Makefile.${SYS_NAME}
 
 CFLAGS=-g -I. \
        -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include \
-       -I${SRCDIR}include/afs \
+       -I${SRCDIR}/include \
+       -I${SRCDIR}/include/afs \
        -I${SRCDIR} \
        -I/usr/include ${XCFLAGS}
 
-RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h
+RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h
 
 INCLS=fsprobe.h ${RPCINCLS}
 
-LIBS=  ${SRCDIR}lib/afs/libvolser.a ${SRCDIR}lib/afs/vlib.a ${SRCDIR}/lib/afs/libacl.a \
-        ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/afs/libvldb.a \
-        ${SRCDIR}lib/libubik.a \
-        ${SRCDIR}lib/afs/libauth.a ${SRCDIR}lib/afs/libsys.a \
-        ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/librxkad.a ${SRCDIR}lib/libdes.a \
-        ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libaudit.a \
-       ${SRCDIR}lib/afs/libafsint.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/util.a 
-
-OBJS=fsprobe.o \
-       fsprobe_callback.o
+LIBS=  ${SRCDIR}/lib/afs/libvolser.a ${SRCDIR}/lib/afs/vlib.a ${SRCDIR}/lib/afs/libacl.a \
+        ${SRCDIR}/lib/afs/libsys.a ${SRCDIR}/lib/afs/libvldb.a \
+        ${SRCDIR}/lib/libubik.a \
+        ${SRCDIR}/lib/afs/libauth.a ${SRCDIR}/lib/afs/libsys.a \
+        ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/librxkad.a ${SRCDIR}/lib/libdes.a \
+        ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/libkauth.a \
+       ${SRCDIR}/lib/afs/libaudit.a \
+       ${SRCDIR}/lib/afs/libafsint.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/afs/util.a 
+
+all: install
 
-include ../config/Makefile.version
-
-noversion: install
-
-all: libfsprobe.a fsprobe_test
-
-libfsprobe.a: ${OBJS} AFS_component_version_number.o
+#
+# Build targets
+#
+libfsprobe.a: fsprobe.o fsprobe_callback.o AFS_component_version_number.o
        -rm -f libfsprobe.a
-       ${AR} rv libfsprobe.a ${OBJS} AFS_component_version_number.o
+       ${AR} rv libfsprobe.a fsprobe.o fsprobe_callback.o AFS_component_version_number.o
        ${RANLIB} libfsprobe.a
 
 fsprobe.o: fsprobe.c ${INCLS} AFS_component_version_number.c
@@ -64,13 +60,23 @@ fsprobe_test: fsprobe_test.o libfsprobe.a ${LIBS}
                ${LIBS} ${XLIBS}
 
 #
-# Misc others
+# Install targets
 #
-system: install
+install: ${DESTDIR}/include/afs/fsprobe.h \
+       ${DESTDIR}/lib/afs/libfsprobe.a \
+       fsprobe_test
 
-install: all
-       ${INSTALL} fsprobe.h    ${DESTDIR}include/afs
-       ${INSTALL} libfsprobe.a ${DESTDIR}lib/afs
+${DESTDIR}/include/afs/fsprobe.h: fsprobe.h
+       ${INSTALL} $? $@
 
+${DESTDIR}/lib/afs/libfsprobe.a: libfsprobe.a
+       ${INSTALL} $? $@
+
+#
+# Misc others
+#
 clean:
        rm -f *.o fsprobe_test libfsprobe.a core AFS_component_version_number.c
+
+include ../config/Makefile.version
+
index 11992f0..68afe2d 100644 (file)
@@ -25,15 +25,15 @@ SYS_NAME=@AFS_SYSNAME@
 include ../config/Makefile.version
 include ../config/Makefile.${SYS_NAME}
 
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a \
-          ${LIBDIR}afs/libaudit.a
+LIBDIR = ${DESTDIR}/lib/
+AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \
+         ${LIBDIR}/afs/libauth.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \
+         ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \
+          ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a \
+          ${LIBDIR}/afs/libaudit.a
 
 LIBS = ${AFSLIBS} 
-CFLAGS=        ${OPTMZ} -I${DESTDIR}include ${XCFLAGS}
+CFLAGS=        ${OPTMZ} -I${DESTDIR}/include ${XCFLAGS}
 LIBC=  /lib/libc.a 
 SRCS=  ftpd.c ftpcmd.c getusershell.c glob.c logwtmp.c popen.c vers.c
 OBJS=  ftpd.o ftpcmd.o getusershell.o glob.o logwtmp.o popen.o vers.o
@@ -65,16 +65,10 @@ clean:
        rm -f ${OBJS} ftpd core ftpcmd.c AFS_component_version_number.c
 
 cleandir: clean
-       rm -f ${MAN} tags .depend
+       rm -f ${MAN} .depend
 
 depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN} all
        ${INSTALL} -s -m 755 ftpd ${DESTDIR}/etc/ftpd
-
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
index 6ff3f8e..9805205 100644 (file)
@@ -18,9 +18,9 @@ include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET=$(SRCDIR)bin/compile_et
 CFLAGS= ${DBUG} -I. -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include -I${SRCDIR}include/afs ${XCFLAGS}
+       -I${SRCDIR}/include -I${SRCDIR}/include/afs ${XCFLAGS}
 LDFLAGS = ${XLDFLAGS}
-#RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h bosint.h
+#RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h bosint.h
 RPCINCLS=
 INCLS=gtxobjects.h \
        gtxwindows.h \
@@ -35,25 +35,23 @@ INCLS=gtxobjects.h \
        gtxframe.h \
        gtxobjdict.h \
        ${RPCINCLS} \
-       ${SRCDIR}include/afs/keys.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/afs/cmd.h
+       ${SRCDIR}/include/afs/keys.h \
+       ${SRCDIR}/include/afs/cellconfig.h \
+       ${SRCDIR}/include/afs/cmd.h
 
 LIBS= \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a
-
-EXTRA_LIBS= ${TXLIBS} ${SRCDIR}lib/afs/libtermlib.a  ${XLIBS} 
-
-LINT_LIBS = /usr/lib/lint/llib-lcurses.ln
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/afs/libkauth.a \
+       ${SRCDIR}/lib/afs/libauth.a \
+       ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/libdes.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/util.a
+
+EXTRA_LIBS= ${TXLIBS} ${SRCDIR}/lib/afs/libtermlib.a  ${XLIBS} 
 
 KEYMAP_SRCS=keymap.c input.c frame.c
 
@@ -135,41 +133,26 @@ curses_test.o: curses_test.c ${INCLS} AFS_component_version_number.o
 curses_test: curses_test.o $(LIBS)
        ${CC} ${CFLAGS} -o curses_test curses_test.o $(LIBS) ${EXTRA_LIBS}
 
-curses_test.lint: curses_test.c $(LINT_LIBS)
-       lint ${CFLAGS} curses_test.c ${LINT_LIBS}
-
 screen_test.o: screen_test.c ${INCLS} AFS_component_version_number.o
 
 screen_test: screen_test.o ${WINDOW_OBJS} ${LIBS}
        ${CC} ${CFLAGS} -o screen_test screen_test.o ${WINDOW_OBJS} ${LIBS} ${EXTRA_LIBS}
 
-screen_test.lint: screen_test.o ${WINDOW_SRCS} ${LINT_LIBS}
-       lint ${CFLAGS} screen_test.c ${WINDOW_SRCS} ${LINT_LIBS}
-
 cb_test.o: cb_test.c ${INCLS} AFS_component_version_number.o
 
 cb_test: cb_test.o ${CB_OBJS} ${LIBS}
        ${CC} ${CFLAGS} -o cb_test cb_test.o ${CB_OBJS} ${LIBS} ${EXTRA_LIBS}
 
-cb_test.lint: cb_test.c ${CB_SRCS} ${LINT_LIBS}
-       lint ${CFLAGS} cb_test.c ${CB_SRCS} ${LINT_LIBS}
-
 gtxtest.o: gtxtest.c ${INCLS} AFS_component_version_number.o
 
 gtxtest: gtxtest.o libgtx.a ${LIBS}
        ${CC} ${LDFLAGS} -o gtxtest gtxtest.o libgtx.a ${LIBS} ${EXTRA_LIBS}
 
-gtxtest.lint: gtxtest.c llib-lgtx.ln ${LINT_LIBS}
-       lint $(CFLAGS) gtxtest.c llib-lgtx.ln ${LINT_LIBS}
-
 object_test.o: object_test.c ${INCLS} AFS_component_version_number.o
 
 object_test: object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} ${LIBS}
        ${CC} ${CFLAGS} -o object_test object_test.o ${WINDOW_OBJS} ${DICT_OBJS} ${OBJECT_OBJS} ${CB_OBJS} ${LIBS} ${EXTRA_LIBS}
 
-object_test.lint: object_test.c ${WINDOW_SRCS} ${DICT_SRCS} ${OBJECT_SRCS} ${CB_SRCS} ${LINT_LIBS}
-       lint ${CFLAGS} object_test.c ${WINDOW_SRCS} ${DICT_SRCS} ${OBJECT_SRCS} ${CB_SRCS} ${LINT_LIBS}
-
 #
 # Misc others
 #
@@ -180,19 +163,9 @@ libgtx.a: ${LIBOBJS} AFS_component_version_number.o
        ar rv $@ ${LIBOBJS} AFS_component_version_number.o
        ${RANLIB} $@
 
-llib-lgtx.ln: ${LIBSRCS}
-       lint -Cgtx ${CFLAGS} ${LIBSRCS}
-
-lint: llib-lgtx.ln \
-       curses_test.lint \
-       screen_test.lint \
-       cb_test.lint \
-       gtxtest.lint \
-       object_test.lint
-
 install: all
-       ${INSTALL} gtx*.h ${DESTDIR}include/afs
-       ${INSTALL} libgtx.a ${DESTDIR}lib/afs
+       ${INSTALL} gtx*.h ${DESTDIR}/include/afs
+       ${INSTALL} libgtx.a ${DESTDIR}/lib/afs
 
 clean:
        rm -f  *.o *.a *.ln object_test screen_test curses_test err.c core cb_test gtxtest AFS_component_version_number.c
index 56de9e3..7d43a5b 100644 (file)
@@ -8,16 +8,16 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}include
+INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}/include
 DEFINES = ${INCLUDES}
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}libubik.a\
-                  ${LIBDIR}afs/libauth.a ${LIBDIR}afs/libsys.a \
-                  ${LIBDIR}librx.a \
-                  ${LIBDIR}afs/libsys.a \
-                  ${LIBDIR}liblwp.a ${DESTDIR}lib/librxkad.a\
-                  ${DESTDIR}lib/libdes.a ${LIBDIR}afs/libcmd.a \
-                  ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a 
+LIBDIR = ${DESTDIR}/lib/
+AFSLIBS =  ${LIBDIR}/afs/libkauth.a ${LIBDIR}/libubik.a\
+                  ${LIBDIR}/afs/libauth.a ${LIBDIR}/afs/libsys.a \
+                  ${LIBDIR}/librx.a \
+                  ${LIBDIR}/afs/libsys.a \
+                  ${LIBDIR}/liblwp.a ${DESTDIR}/lib/librxkad.a\
+                  ${DESTDIR}/lib/libdes.a ${LIBDIR}/afs/libcmd.a \
+                  ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a 
 LIBRES = 
 LIBS = ${AFSLIBS} ${LIBRES} ${XLIBS}
 OBJS = inetd.o setenv.o getenv.o
@@ -50,15 +50,15 @@ clean:
        rm -f inetd *.o *.BAK *~ core AFS_component_version_number.c
 
 install: all
-       ${INSTALL} -s -m 755 inetd ${DESTDIR}etc/inetd
+       ${INSTALL} -s -m 755 inetd ${DESTDIR}/etc/inetd
        set -x; \
        case "${SYS_NAME}" in \
        sun4* ) \
-               ${INSTALL} -m 644 -f inetd.conf.solaris ${DESTDIR}etc/inetd.conf ;; \
+               ${INSTALL} -m 644 -f inetd.conf.solaris ${DESTDIR}/etc/inetd.conf ;; \
        sgi_* ) \
-               ${INSTALL} -m 644 -f inetd.conf.sgi ${DESTDIR}etc/inetd.conf ;; \
+               ${INSTALL} -m 644 -f inetd.conf.sgi ${DESTDIR}/etc/inetd.conf ;; \
        alpha_dux?? ) \
-               ${INSTALL} -m 644 -f inetd.conf.dux40 ${DESTDIR}etc/inetd.conf ;; \
+               ${INSTALL} -m 644 -f inetd.conf.dux40 ${DESTDIR}/etc/inetd.conf ;; \
        * ) \
-               ${INSTALL} -m 644 inetd.conf ${DESTDIR}etc/inetd.conf ;; \
+               ${INSTALL} -m 644 inetd.conf ${DESTDIR}/etc/inetd.conf ;; \
        esac
index a909b12..9617472 100644 (file)
@@ -16,50 +16,50 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR = ../libuafs/
-COMPILE_ET = ${SRCDIR}bin/compile_et
+COMPILE_ET = ${SRCDIR}/bin/compile_et
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
-CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 LDFLAGS = ${OPTMZ} ${XLDFLAGS}
-INCLS=${SRCDIR}include/ubik.h \
-             ${SRCDIR}include/lwp.h \
-             ${SRCDIR}include/lock.h  \
-             ${SRCDIR}include/rx/rx.h \
-             ${SRCDIR}include/rx/xdr.h \
-            ${SRCDIR}include/rx/rxkad.h \
-            ${SRCDIR}include/afs/com_err.h \
+INCLS=${SRCDIR}/include/ubik.h \
+             ${SRCDIR}/include/lwp.h \
+             ${SRCDIR}/include/lock.h  \
+             ${SRCDIR}/include/rx/rx.h \
+             ${SRCDIR}/include/rx/xdr.h \
+            ${SRCDIR}/include/rx/rxkad.h \
+            ${SRCDIR}/include/afs/com_err.h \
        kaserver.h kauth.h kautils.h 
 
-LIBS = ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libprot.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/librxstat.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a  \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a \
+LIBS = ${SRCDIR}/lib/libubik.a \
+       ${SRCDIR}/lib/afs/libprot.a \
+       ${SRCDIR}/lib/afs/libauth.a \
+       ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/librxstat.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/afs/libsys.a  \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/libdes.a \
+       ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/util.a \
        $(DBM)
 
 UKSRCS=authclient.c user.c kautils.h kaserver.h kaaux.c token.c \
        kalocalcell.c client.c kaerrors.c
 
-KLIBS = ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libprot.a \
-       ${SRCDIR}lib/afs/libauth.krb.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a  \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a 
+KLIBS = ${SRCDIR}/lib/libubik.a \
+       ${SRCDIR}/lib/afs/libprot.a \
+       ${SRCDIR}/lib/afs/libauth.krb.a \
+       ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/afs/libsys.a  \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/libdes.a \
+       ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/util.a 
 
 OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o 
 KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o
@@ -77,7 +77,7 @@ clean:
        rm -f *.o kaserver kas klog multiklog kpasswd klogin rebuild kauth.cs.c kauth.ss.c kauth.xdr.c kauth.h kautils.h kaerrors.c *.a core kpwvalid AFS_component_version_number.c klog.krb knfs klogin.krb kdb Kkauth.xdr.c Kkauth.h Kkauth.cs.c
 
 kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaserver.o kaaux.o krb_udp.o kaauxdb.o $(LIBS) 
-       ${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${SRCDIR}lib/afs/libaudit.a
+       ${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${SRCDIR}/lib/afs/libaudit.a
 
 kaserver.o: kaserver.c ${INCLS} AFS_component_version_number.o
 
@@ -106,16 +106,16 @@ 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
-       ${SRCDIR}bin/rxgen -x kauth.rg
+       ${SRCDIR}/bin/rxgen -x kauth.rg
 
 Kkauth.cs.c: kauth.rg Kkauth.h
-       ${SRCDIR}bin/rxgen -x -k -C -o Kkauth.cs.c kauth.rg
+       ${SRCDIR}/bin/rxgen -x -k -C -o Kkauth.cs.c kauth.rg
 
 Kkauth.xdr.c: kauth.rg
-       ${SRCDIR}bin/rxgen -x -k -c -o Kkauth.xdr.c kauth.rg
+       ${SRCDIR}/bin/rxgen -x -k -c -o Kkauth.xdr.c kauth.rg
 
 Kkauth.h: kauth.rg
-       ${SRCDIR}bin/rxgen -x -k -h -o Kkauth.h kauth.rg
+       ${SRCDIR}/bin/rxgen -x -k -h -o Kkauth.h kauth.rg
 
 libkauth.a: $(OBJS) AFS_component_version_number.o
        -rm -f libkauth.a
@@ -183,10 +183,10 @@ kpwvalid.o: kpwvalid.c AFS_component_version_number.o
 kpwvalid: kpwvalid.o $(LIBS)
        ${CC} ${LDFLAGS} -o kpwvalid kpwvalid.o ${LIBS} ${XLIBS}
 
-user.krb.o: user.c ${INCLS} ${SRCDIR}include/afs/vice.h
+user.krb.o: user.c ${INCLS} ${SRCDIR}/include/afs/vice.h
        ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c user.c -o user.krb.o
 
-user.o: user.c ${INCLS} ${SRCDIR}include/afs/vice.h
+user.o: user.c ${INCLS} ${SRCDIR}/include/afs/vice.h
        ${CC} ${CFLAGS} -c user.c
 
 kdb: kdb.o ${INCLS}
@@ -194,71 +194,71 @@ kdb: kdb.o ${INCLS}
 kdb.o: kdb.c AFS_component_version_number.o
 
 krb_udp.o: krb_udp.c kaserver.h kautils.h kauth.h prot.h \
-          ${SRCDIR}include/lwp.h AFS_component_version_number.o
+          ${SRCDIR}/include/lwp.h AFS_component_version_number.o
 
 krb_udp: krb_udp.o libkauth.a
-       ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/libdes.a ${SRCDIR}lib/librxkad.a ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/libutil.a ${SRCDIR}lib/afs/libaudit.a
+       ${CC} ${LDFLAGS} -o krb_udp krb_udp.o libkauth.a ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/libdes.a ${SRCDIR}/lib/librxkad.a ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/libutil.a ${SRCDIR}/lib/afs/libaudit.a
 
 rebuild.o: rebuild.c $(INCLS) AFS_component_version_number.o
 
-rebuild: rebuild.o kautils.o ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a ${SRCDIR}lib/libdes.a
+rebuild: rebuild.o kautils.o ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/util.a ${SRCDIR}/lib/libdes.a
        ${CC} ${LDFLAGS} -o rebuild rebuild.o kautils.o \
-               ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a ${SRCDIR}lib/libdes.a ${XLIBS} ${SRCDIR}lib/afs/libcmd.a
-       ${INSTALL} -f rebuild ${DESTDIR}etc/kadb_check
+               ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/util.a ${SRCDIR}/lib/libdes.a ${XLIBS} ${SRCDIR}/lib/afs/libcmd.a
+       ${INSTALL} -f rebuild ${DESTDIR}/etc/kadb_check
 
 system: install
 
 ${DESTDIR}root.server/usr/afs/bin/kaserver: kaserver
        ${INSTALL} -s $? $@
 
-${DESTDIR}etc/kas ${DESTDIR}root.server/usr/afs/bin/kas: kas 
+${DESTDIR}/etc/kas ${DESTDIR}root.server/usr/afs/bin/kas: kas 
        ${INSTALL} -s $? $@
 
-${DESTDIR}bin/kpwvalid ${DESTDIR}etc/kpwvalid \
+${DESTDIR}/bin/kpwvalid ${DESTDIR}/etc/kpwvalid \
 ${DESTDIR}root.server/usr/afs/bin/kpwvalid: kpwvalid 
        ${INSTALL} $? $@
 
-${DESTDIR}bin/klog ${DESTDIR}root.server/usr/afs/bin/klog: klog 
+${DESTDIR}/bin/klog ${DESTDIR}root.server/usr/afs/bin/klog: klog 
        ${INSTALL} -s $? $@
 
-${DESTDIR}bin/klog.krb ${DESTDIR}root.server/usr/afs/bin/klog.krb: klog.krb 
+${DESTDIR}/bin/klog.krb ${DESTDIR}root.server/usr/afs/bin/klog.krb: klog.krb 
        ${INSTALL} -s $? $@
 
-${DESTDIR}bin/knfs: knfs 
+${DESTDIR}/bin/knfs: knfs 
        ${INSTALL} -s $? $@
 
-${DESTDIR}bin/kpasswd: kpasswd 
+${DESTDIR}/bin/kpasswd: kpasswd 
        ${INSTALL} -s $? $@
 
-${DESTDIR}lib/afs/libkauth.a: libkauth.a 
+${DESTDIR}/lib/afs/libkauth.a: libkauth.a 
        ${INSTALL} $? $@
 
-${DESTDIR}lib/afs/libkauth.krb.a: libkauth.krb.a 
+${DESTDIR}/lib/afs/libkauth.krb.a: libkauth.krb.a 
        ${INSTALL} $? $@
 
-${DESTDIR}etc/kdb: kdb 
+${DESTDIR}/etc/kdb: kdb 
        ${INSTALL} -s $? $@
 
 ukinstall webinstall: ${UKSRCS} Kkauth.h Kkauth.xdr.c Kkauth.cs.c kauth.h
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} Kkauth.h ${UKERNELDIR}afsint/kauth.h
-       ${INSTALL} Kkauth.xdr.c ${UKERNELDIR}afsint/kauth.xdr.c
-       ${INSTALL} Kkauth.cs.c ${UKERNELDIR}afsint/kauth.cs.c
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+       set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED)
+       set ${UKERNELDIR}/afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} Kkauth.h ${UKERNELDIR}/afsint/kauth.h
+       ${INSTALL} Kkauth.xdr.c ${UKERNELDIR}/afsint/kauth.xdr.c
+       ${INSTALL} Kkauth.cs.c ${UKERNELDIR}/afsint/kauth.cs.c
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs
 
 
 install: all ukinstall ${DESTDIR}root.server/usr/afs/bin/kaserver \
-       ${DESTDIR}etc/kas ${DESTDIR}etc/kpwvalid \
+       ${DESTDIR}/etc/kas ${DESTDIR}/etc/kpwvalid \
        ${DESTDIR}root.server/usr/afs/bin/kas \
        ${DESTDIR}root.server/usr/afs/bin/kpwvalid \
-       ${DESTDIR}bin/klog ${DESTDIR}bin/klog.krb \
+       ${DESTDIR}/bin/klog ${DESTDIR}/bin/klog.krb \
        ${DESTDIR}root.server/usr/afs/bin/klog \
        ${DESTDIR}root.server/usr/afs/bin/klog.krb \
-       ${DESTDIR}bin/knfs ${DESTDIR}bin/kpasswd \
-       ${DESTDIR}bin/kpwvalid ${DESTDIR}lib/afs/libkauth.a \
-       ${DESTDIR}lib/afs/libkauth.krb.a ${DESTDIR}etc/kdb
-       ${INSTALL} kautils.h kauth.h kaport.h ${DESTDIR}include/afs
+       ${DESTDIR}/bin/knfs ${DESTDIR}/bin/kpasswd \
+       ${DESTDIR}/bin/kpwvalid ${DESTDIR}/lib/afs/libkauth.a \
+       ${DESTDIR}/lib/afs/libkauth.krb.a ${DESTDIR}/etc/kdb
+       ${INSTALL} kautils.h kauth.h kaport.h ${DESTDIR}/include/afs
 
 
 
index 7300b44..0094e64 100644 (file)
@@ -15,8 +15,8 @@ SYS_NAME=@AFS_SYSNAME@
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include
+LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -L${BACKDIR}/lib -L${BACKDIR}/lib/afs
 LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lcom_err -lkauth
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
index 136fe33..6152982 100644 (file)
@@ -14,8 +14,8 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I.. \
-       -I${BACKDIR}include -I${DESTDIR}include/afs 
+INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I.. \
+       -I${BACKDIR}/include -I${DESTDIR}/include/afs 
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
 
@@ -42,15 +42,15 @@ clean:
 system: install
 
 kinstall:
-       ${INSTALL} prs_fs.h ${KERNELDIR}afs/prs_fs.h
+       ${INSTALL} prs_fs.h ${KERNELDIR}/afs/prs_fs.h
 
 ukinstall webinstall:
-       ${INSTALL} prs_fs.h ${UKERNELDIR}afs/prs_fs.h
+       ${INSTALL} prs_fs.h ${UKERNELDIR}/afs/prs_fs.h
 
 install: libacl.a kinstall ukinstall
-       ${INSTALL} libacl.a ${DESTDIR}lib/afs/libacl.a
-       ${INSTALL} acl.h ${DESTDIR}include/afs/acl.h
-       ${INSTALL} prs_fs.h ${DESTDIR}include/afs/prs_fs.h
+       ${INSTALL} libacl.a ${DESTDIR}/lib/afs/libacl.a
+       ${INSTALL} acl.h ${DESTDIR}/include/afs/acl.h
+       ${INSTALL} prs_fs.h ${DESTDIR}/include/afs/prs_fs.h
 
 test:
        cd test; $(MAKE)
index cbe76ec..9db796f 100644 (file)
@@ -15,8 +15,8 @@ SYS_NAME=@AFS_SYSNAME@
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include
+LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -L${BACKDIR}/lib -L${BACKDIR}/lib/afs
 LIBS= -lacl -lprot -lubik -lrx -llwp -lauth -lrxkad -lsys ${XLIBS}
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
index c84ba62..9247e3c 100644 (file)
@@ -12,8 +12,12 @@ SYS_NAME=@AFS_SYSNAME@
 
 include ../config/Makefile.${SYS_NAME}
 
-system install: 
-       ${INSTALL} afs_Admin.h ${DESTDIR}include/afs
+all: install
+
+install: ${DESTDIR}/include/afs/afs_Admin.h
+
+${DESTDIR}/include/afs/afs_Admin.h: afs_Admin.h
+       ${INSTALL} $? $@
 
 clean:
 
index be15f5e..dccc9d4 100644 (file)
@@ -51,7 +51,7 @@ OPT2   = -O
 
 IMPORTS = -bI:/lib/kernex.exp -bI:/lib/syscalls.exp -bI:/lib/sockets.exp \
        -bI:/lib/netinet.exp \
-       -bI:${DESTDIR}lib/afs/extras.exp -bI:${DESTDIR}lib/afs/export.exp
+       -bI:${DESTDIR}/lib/afs/extras.exp -bI:${DESTDIR}/lib/afs/export.exp
 KDEFS = -U_IBMR2 -D_POWER -D_AIX -DNLS -D_NLS -DMSG -D__STR31__ -Daiws \
        -D_POWER_RS -D_POWER_PC -D_POWER_RS1 -D_POWER_RS2 -D_POWER_RSC \
         -D_POWER_601 -D_POWER_603 -D_POWER_604 -D_THREADS -M  -D_KERNEL \
index 32e6a8b..c5d3605 100644 (file)
@@ -17,7 +17,7 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 CC=${MT_CC}
-CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${MT_CFLAGS} 
+CFLAGS = ${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${MT_CFLAGS} 
 CCRULE = ${CC} ${CFLAGS} -c $?
 
 AUDIT= ../audit
@@ -94,10 +94,10 @@ LIBOBJS = \
        ${PTSERVEROBJS} \
        ${SYSOBJS}
 
-system install: ${DESTDIR}lib/libafsauthent.a
+system install: ${DESTDIR}/lib/libafsauthent.a
 
-${DESTDIR}lib/libafsauthent.a: libafsauthent.a
-       ${INSTALL} libafsauthent.a ${DESTDIR}lib/libafsauthent.a
+${DESTDIR}/lib/libafsauthent.a: libafsauthent.a
+       ${INSTALL} libafsauthent.a ${DESTDIR}/lib/libafsauthent.a
 
 libafsauthent.a: ${LIBOBJS}
        rm -f libafsauthent.a
index 44cfdf2..6c5a8f1 100644 (file)
@@ -17,9 +17,9 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 CC=${MT_CC}
-INCLUDES = -I${SRCDIR}include -I.. -I../rx
+INCLUDES = -I${SRCDIR}/include -I.. -I../rx
 CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} -I${TOP_SRCDIR}/config
-SFLAGS=-P -I${SRCDIR}include
+SFLAGS=-P -I${SRCDIR}/include
 RX = ../rx
 CCRULE = ${CC} ${CFLAGS} -c $?
 RXKAD = ../rxkad
@@ -97,9 +97,11 @@ DESOBJS =\
        key_parity.o \
        weak_key.o \
        strng_to_key.o \
-       misco.o \
+       misc.o \
        util.o
 
+CRYPT_OBJ = crypt.o
+
 LIBOBJS = \
        ${RXOBJS} \
        ${DESOBJS} \
@@ -112,10 +114,10 @@ LIBOBJS = \
        ${RXSTATOBJS} \
        ${FSINTOBJS}
 
-system install: ${DESTDIR}lib/libafsrpc.a
+system install: ${DESTDIR}/lib/libafsrpc.a
 
-${DESTDIR}lib/libafsrpc.a: libafsrpc.a
-       ${INSTALL} libafsrpc.a ${DESTDIR}lib/libafsrpc.a
+${DESTDIR}/lib/libafsrpc.a: libafsrpc.a
+       ${INSTALL} libafsrpc.a ${DESTDIR}/lib/libafsrpc.a
 
 libafsrpc.a: ${LIBOBJS}
        rm -f libafsrpc.a
@@ -290,8 +292,8 @@ weak_key.o: ${DES}/weak_key.c
 strng_to_key.o: ${DES}/strng_to_key.c
        ${CCRULE};
 
-misco.o: ${DES}/misco.c
-       ${CCRULE} -DDONT_INCL_MAIN;
+misc.o: ${DES}/misc.c
+       ${CCRULE};
 
 util.o: ${DES}/util.c
        ${CCRULE};
index 09204ec..b578dfa 100644 (file)
@@ -10,58 +10,41 @@ SRCDIR=@SRCDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
-
 include ../config/Makefile.${SYS_NAME}
 
-INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${DESTDIR}include/afs 
+INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I${DESTDIR}/include/afs 
 
 CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBUG}
 
 PROGRAMS=      unlog tokens tokens.krb kseal
 
-INCLS=${SRCDIR}include/afs/auth.h ${SRCDIR}include/rx/rx.h \
-${SRCDIR}include/rx/xdr.h ${SRCDIR}include/des.h ${SRCDIR}include/rx/rxkad.h \
-${SRCDIR}include/afs/cellconfig.h
-
-LIBRARIES=     ${SRCDIR}lib/afs/libauth.a \
-               ${SRCDIR}lib/librxkad.a \
-               ${SRCDIR}lib/libdes.a \
-               ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
-               ${SRCDIR}lib/afs/libsys.a \
-               ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
-               ${SRCDIR}lib/afs/util.a
-KLIBRARIES=    ${SRCDIR}lib/afs/libauth.krb.a \
-               ${SRCDIR}lib/librxkad.a \
-               ${SRCDIR}lib/libdes.a \
-               ${SRCDIR}lib/afs/libsys.a ${SRCDIR}lib/librx.a \
-               ${SRCDIR}lib/afs/libsys.a \
-               ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
-               ${SRCDIR}lib/afs/util.a
-
-include ../config/Makefile.version
-
-# top-level options
-
-all:   ${PROGRAMS}
-
-install:       all
-       ${INSTALL} -s unlog tokens tokens.krb ${DESTDIR}bin
-       ${INSTALL} -s tokens tokens.krb ${DESTDIR}root.server/usr/afs/bin
-       ${INSTALL} -s kseal ${DESTDIR}etc
-
-lint:  log.c passwd.c unlog.c testlog.c
-       lint  ${INCDIRS} log.c 
-       lint  ${INCDIRS} unlog.c 
-       lint  ${INCDIRS} passwd.c
-
-clean: 
-       rm -f *.o log passwd unlog tokens kseal core AFS_component_version_number.c tokens.krb
-
-beancount:
-       wc -l log.c passwd.c unlog.c 
-
-# programs
-
+INCLS=${SRCDIR}/include/afs/auth.h ${SRCDIR}/include/rx/rx.h \
+${SRCDIR}/include/rx/xdr.h ${SRCDIR}/include/des.h ${SRCDIR}/include/rx/rxkad.h \
+${SRCDIR}/include/afs/cellconfig.h
+
+LIBRARIES=     ${SRCDIR}/lib/afs/libauth.a \
+               ${SRCDIR}/lib/librxkad.a \
+               ${SRCDIR}/lib/libdes.a \
+               ${SRCDIR}/lib/afs/libsys.a ${SRCDIR}/lib/librx.a \
+               ${SRCDIR}/lib/afs/libsys.a \
+               ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/libcmd.a \
+               ${SRCDIR}/lib/afs/util.a
+KLIBRARIES=    ${SRCDIR}/lib/afs/libauth.krb.a \
+               ${SRCDIR}/lib/librxkad.a \
+               ${SRCDIR}/lib/libdes.a \
+               ${SRCDIR}/lib/afs/libsys.a ${SRCDIR}/lib/librx.a \
+               ${SRCDIR}/lib/afs/libsys.a \
+               ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/libcmd.a \
+               ${SRCDIR}/lib/afs/util.a
+
+#
+# Main targets
+#
+all: install
+
+#
+# Build targets
+#
 kseal: kseal.o ${LIBRARIES}
        ${CC} -o kseal kseal.o ${LIBRARIES} ${XLIBS} ${CFLAGS}
 
@@ -80,13 +63,46 @@ tokens: tokens.o ${LIBRARIES}
 tokens.krb: tokens.o ${KLIBRARIES}
        ${CC} -o tokens.krb tokens.o ${KLIBRARIES} ${XLIBS} ${CFLAGS}
 
-# objects
+kseal.o: kseal.c ${INCLS} AFS_component_version_number.c
+unlog.o: unlog.c AFS_component_version_number.c
+tokens.o: tokens.c ${SRCDIR}/include/rx/xdr.h AFS_component_version_number.c
 
-kseal.o:               kseal.c ${INCLS} AFS_component_version_number.c
-unlog.o:               unlog.c AFS_component_version_number.c
-tokens.o:              tokens.c ${SRCDIR}include/rx/xdr.h AFS_component_version_number.c
-#log.o:                log.c ${SRCDIR}include/afs/comauth.h ${SRCDIR}include/r/xdr.h
-#passwd.o:     passwd.c ${SRCDIR}include/afs/comauth.h ${SRCDIR}include/r/xdr.h ${SRCDIR}include/r/r.h
+#
+# Install targets
+#
+install: ${DESTDIR}/bin/unlog \
+       ${DESTDIR}/bin/tokens \
+       ${DESTDIR}/bin/tokens.krb \
+       ${DESTDIR}/root.server/usr/afs/bin/tokens \
+       ${DESTDIR}/root.server/usr/afs/bin/tokens.krb \
+       ${DESTDIR}/etc/kseal
+
+${DESTDIR}/bin/unlog: unlog
+       ${INSTALL} $? $@
+
+${DESTDIR}/bin/tokens: tokens
+       ${INSTALL} $? $@
+
+${DESTDIR}/bin/tokens.krb: tokens.krb
+       ${INSTALL} $? $@
+
+${DESTDIR}/root.server/usr/afs/bin/tokens: tokens
+       ${INSTALL} $? $@
+
+${DESTDIR}/root.server/usr/afs/bin/tokens.krb: tokens.krb
+       ${INSTALL} $? $@
+
+${DESTDIR}/etc/kseal: kseal
+       ${INSTALL} $? $@
+
+#
+# Misc. targets
+#
+clean: 
+       rm -f *.o log passwd unlog tokens kseal core AFS_component_version_number.c tokens.krb
 
 test:
        cd test; $(MAKE)
+
+include ../config/Makefile.version
+
index aa99af0..2729a68 100644 (file)
@@ -15,8 +15,8 @@ SYS_NAME=@AFS_SYSNAME@
 BACKDIR=../../../../PARENT/dest/
 OPTIMIZE=-O
 
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include -I${DESTDIR}include/afs -I${BACKDIR}include/afs
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L.. -L${BACKDIR}lib -L${BACKDIR}lib/afs
+INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include -I${DESTDIR}/include/afs -I${BACKDIR}/include/afs
+LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L.. -L${BACKDIR}/lib -L${BACKDIR}/lib/afs
 LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd -lafsutil ${XLIBS}
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
@@ -24,10 +24,6 @@ CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
 # top-level options
 system all test: testlog gettoktest
 
-lint:  
-       lint  ${INCDIRS} testlog.c
-       lint  ${INCDIRS} gettoktest.c
-
 clean: 
        rm -f *.o testlog gettoktest core
 
index 86c39b8..d9bb698 100644 (file)
@@ -25,16 +25,16 @@ SYS_NAME=@AFS_SYSNAME@
 
 include ../config/Makefile.${SYS_NAME}
 
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
-KAFSLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.krb.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
-INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}include -I/usr/include -I/usr/include/sys
+LIBDIR = ${DESTDIR}/lib/
+AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \
+         ${LIBDIR}/afs/libauth.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \
+         ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \
+          ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a
+KAFSLIBS = ${LIBDIR}/afs/libkauth.krb.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \
+         ${LIBDIR}/afs/libauth.krb.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \
+         ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \
+          ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a
+INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I/usr/include -I/usr/include/sys
 CFLAGS=        -g ${XCFLAGS} ${INCLUDES}
 LIBC=  /lib/libc.a
 SRCS=  login.c 
@@ -85,13 +85,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN} all
-       ${INSTALL} -s login ${DESTDIR}bin/login
-       ${INSTALL} -s login.krb ${DESTDIR}bin/login.krb
-
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
+       ${INSTALL} -s login ${DESTDIR}/bin/login
+       ${INSTALL} -s login.krb ${DESTDIR}/bin/login.krb
 
 system: install
index 604cdc4..2131e29 100644 (file)
@@ -18,94 +18,75 @@ include ../config/Makefile.${SYS_NAME}
 # subtle bugs that may have been introduced in process.s, be warned!
 OPTIMIZE=${LWP_OPTMZ}
 
-CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-
-include ../config/Makefile.version
+CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 
 LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \
        waitkey.o threadname.o AFS_component_version_number.o
-LIBTOBJS=tlwp.o process.o lock.o tiomgr.o timer.o fasttime.o preempt.o AFS_component_version_number.o pthread.o threadname.o
 
-noversion: install
+all: install
 
 #
-#      The lwp library
+# Build rules
 #
-liblwp.a       : ${LIBOBJS}
-               -rm -f liblwp.a
-               $(AR) rv liblwp.a ${LIBOBJS}
-               $(RANLIB) liblwp.a
-
-libtlwp.a      : ${LIBTOBJS}
-               -rm -f libtlwp.a
-               $(AR) rv libtlwp.a ${LIBTOBJS}
-               $(RANLIB) libtlwp.a
-
-tlwp.o: lwp.c lwp.h
-       ${CC} ${CFLAGS} -DUSE_SOLARIS_THREADSX -c lwp.c
-       mv lwp.o tlwp.o
-
-tiomgr.o: iomgr.c lwp.h
-       ${CC} ${CFLAGS} -DUSE_SOLARIS_THREADSX -c iomgr.c
-       mv iomgr.o tiomgr.o
-
-pthread.o      : pthread.c
-       ${CC} ${CFLAGS} -DUSE_SOLARIS_THREADSX -c pthread.c
+liblwp.a: ${LIBOBJS}
+       -rm -f liblwp.a
+       $(AR) rv liblwp.a ${LIBOBJS}
+       $(RANLIB) liblwp.a
 
 process.s:
        # This is required so sgi_64+ does not try to build this file.
        echo Nothing to be done for process.s
 
 process.o      : process.s process.c
-                       case "$(SYS_NAME)" in \
-                               pmax_he1) \
-                                       $(CC) -c -I${SRCDIR}include process.s;; \
-                               sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
-                                       /usr/ccs/lib/cpp -P -I${SRCDIR}include process.s process.ss; \
-                                       ${AS} process.ss -o process.o; \
-                                       rm process.ss ;; \
-                               sgi_5* ) \
-                                       $(CC) -c -I${SRCDIR}include -KPIC -G0  process.s;; \
-                               sgi_61 | sgi_62 | sgi_63 ) \
-                                       $(CC) -c ${XCFLAGS} -I${SRCDIR}include -KPIC -G0  process.s;; \
-                               s390*) \
-                                       /lib/cpp -P -I${SRCDIR}include process.s >process.ss; \
-                                       ${AS} -ahlns process.ss -o process.o >process.lst; \
-                                       rm process.ss ;; \
-                               ppc_darwin* ) \
-                                       $(CC) -c ${XCFLAGS} -I${SRCDIR}include process.s;; \
-                               i386_fbsd* ) \
-                                       /usr/bin/cpp -P process.fbsd.s > process.ss; \
-                                       ${AS} -o process.o process.ss; \
-                                       rm process.ss ;; \
-                               hp* | *_linux* | sgi_64 | sgi_65 ) \
-                                       ${CC} ${CFLAGS} -c process.c;; \
-                               ncrx86_*) \
-                                       /usr/ccs/lib/cpp -P -I${SRCDIR}include process.s process.ss; \
-                                       ${AS} -o process.o process.ss; \
-                                       rm process.ss ;; \
-                               alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \
-                                       ${AS} -v  -P -DOSF -I${SRCDIR}include -DASSEMBLER process.s; \
-                                       ${AS} -v process.i -o process.o;; \
-                               hp_ux110 ) \
-                                       ${CC} ${CFLAGS} -c process.c;; \
-                               *) \
-                                       /lib/cpp -P -I${SRCDIR}include process.s process.ss; \
-                                       ${AS} process.ss -o process.o; \
-                                       rm process.ss ;; \
-                       esac
+       @case "$(SYS_NAME)" in \
+       pmax_he1) \
+               $(CC) -c -I${SRCDIR}/include process.s;; \
+       sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sunx86_54) \
+               /usr/ccs/lib/cpp -P -I${SRCDIR}/include process.s process.ss; \
+               ${AS} process.ss -o process.o; \
+                       rm process.ss ;; \
+       sgi_5* ) \
+               $(CC) -c -I${SRCDIR}/include -KPIC -G0  process.s;; \
+       sgi_61 | sgi_62 | sgi_63 ) \
+               $(CC) -c ${XCFLAGS} -I${SRCDIR}/include -KPIC -G0  process.s;; \
+       s390*) \
+               /lib/cpp -P -I${SRCDIR}/include process.s >process.ss; \
+               ${AS} -ahlns process.ss -o process.o >process.lst; \
+               rm process.ss ;; \
+       ppc_darwin* ) \
+               $(CC) -c ${XCFLAGS} -I${SRCDIR}/include process.s;; \
+       i386_fbsd* ) \
+               /usr/bin/cpp -P process.fbsd.s > process.ss; \
+               ${AS} -o process.o process.ss; \
+               rm process.ss ;; \
+       hp* | *_linux* | sgi_64 | sgi_65 ) \
+               ${CC} ${CFLAGS} -c process.c;; \
+       ncrx86_*) \
+               /usr/ccs/lib/cpp -P -I${SRCDIR}/include process.s process.ss; \
+               ${AS} -o process.o process.ss; \
+               rm process.ss ;; \
+       alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \
+               ${AS} -v  -P -DOSF -I${SRCDIR}/include -DASSEMBLER process.s; \
+               ${AS} -v process.i -o process.o;; \
+       hp_ux110 ) \
+               ${CC} ${CFLAGS} -c process.c;; \
+       *) \
+               /lib/cpp -P -I${SRCDIR}/include process.s process.ss; \
+               ${AS} process.ss -o process.o; \
+               rm process.ss ;; \
+       esac
 
 iomgr.o                : iomgr.c lwp.h timer.h
                ${CC} -c ${CFLAGS}  iomgr.c
 
 preempt.o      : preempt.c lwp.h preempt.h
 lwp.o          : lwp.c lwp.h
-                       case "$(SYS_NAME)" in \
-                               rs_aix*) \
-                                       $(CC) -I${TOP_SRCDIR}/config -I${SRCDIR}include -c lwp.c;; \
-                               *)  \
-                                       $(CC) ${CFLAGS} -c lwp.c;; \
-                       esac
+       case "$(SYS_NAME)" in \
+               rs_aix*) \
+                       $(CC) -I${TOP_SRCDIR}/config -I${SRCDIR}/include -c lwp.c;; \
+               *)  \
+                       $(CC) ${CFLAGS} -c lwp.c;; \
+               esac
 lock.o         : lock.c lock.h lwp.h
 timer.o                : timer.c
 fasttime.o     : fasttime.c
@@ -124,28 +105,33 @@ rw.o: rw.c
 
 
 #
-#      Installation
+# Install targets
+#
+install: ${DESTDIR}/lib/liblwp.a \
+       ${DESTDIR}/include/lock.h \
+       ${DESTDIR}/include/lwp.h \
+       ${DESTDIR}/include/preempt.h \
+       ${DESTDIR}/include/timer.h
+
+${DESTDIR}/lib/liblwp.a: liblwp.a
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/lock.h: lock.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/lwp.h: lwp.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/preempt.h: preempt.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/timer.h: timer.h
+       ${INSTALL} $? $@
+
+#
+# Misc. targets
 #
-all: system
-system:        install
-
-kinstall ukinstall webinstall:
-       @echo No kernel source here.
-
-install: liblwp.a #libtlwp.a
-               ${INSTALL} liblwp.a ${DESTDIR}lib
-               ${INSTALL} *.h ${DESTDIR}include
-               case ${SYS_NAME} in \
-                   sun4_52 | sun4_53 | sun4c_52 | sun4c_53 | sun4m_52 | sun4m_53 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5?) \
-                       echo "Don't install libtrx.a for ${SYS_NAME}" ;; \
-                    * ) \
-                       echo "Don't install libtrx.a for ${SYS_NAME}" ;; \
-               esac
 clean:
        rm -f *.o *.a core AFS_component_version_number.c
 
-beancount:
-       wc -l *.[ch]
-
-includes:
-       ${INSTALL} *.h ${DESTDIR}include
+include ../config/Makefile.version
index 282bfbf..e11f7ae 100644 (file)
@@ -14,10 +14,10 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCPATH= -I${TOP_SRCDIR}/config -I${DESTDIR}include
+INCPATH= -I${TOP_SRCDIR}/config -I${DESTDIR}/include
 BINDIR=/usr/local/etc
 LINKDIR=/etc
-LIBS= ${DESTDIR}lib/afs/util.a  
+LIBS= ${DESTDIR}/lib/afs/util.a  
 
 VERS=3.4
 
@@ -133,10 +133,10 @@ ntpd.o:   patchlevel.h
 
 system: install
 
-AFSLIBS= ${DESTDIR}lib/afs/libauth.a ${DESTDIR}lib/afs/libcom_err.a ${DESTDIR}lib/afs/util.a 
+AFSLIBS= ${DESTDIR}/lib/afs/libauth.a ${DESTDIR}/lib/afs/libcom_err.a ${DESTDIR}/lib/afs/util.a 
 
 runntp.o: runntp.c ${DESTDIR}/include/afs/cellconfig.h AFS_component_version_number.c
-       ${CC} ${CFLAGS} -I${DESTDIR}include -c runntp.c ${AFSLIBS} ${XLIBS}
+       ${CC} ${CFLAGS} -I${DESTDIR}/include -c runntp.c ${AFSLIBS} ${XLIBS}
 
 runntp: runntp.o ${AFSLIBS}
        ${CC} ${LDFLAGS} -o runntp runntp.o ${AFSLIBS} ${XLIBS}
@@ -144,8 +144,8 @@ runntp: runntp.o ${AFSLIBS}
 install: AFS_component_version_number.c ntest ntpd ntp ntpdc runntp
        ${INSTALL} ntpd ${DESTDIR}root.server/usr/afs/bin/ntpd
        ${INSTALL} ntpdc ${DESTDIR}root.server/usr/afs/bin/ntpdc
-       ${INSTALL} ntp ${DESTDIR}etc/ntp
-       ${INSTALL} ntpdc ${DESTDIR}etc/ntpdc
+       ${INSTALL} ntp ${DESTDIR}/etc/ntp
+       ${INSTALL} ntpdc ${DESTDIR}/etc/ntpdc
        ${INSTALL} runntp ${DESTDIR}root.server/usr/afs/bin/runntp
 
 #
@@ -165,9 +165,6 @@ print:
 clean:
        @rm -f *.o *~ core ${PROGS} ntp.tar ntest sock_test AFS_component_version_number.c
 
-lint:
-       lint -bac ${DEFINES} ${NTPDSRC}
-
 dist:  ntp.tar.Z
        mv ntp.tar.Z /usr/ftp/pub/ntp.${VERS}/ntp.tar.Z
 
index 79024d8..cf26232 100644 (file)
@@ -11,16 +11,17 @@ SRCDIR=@SRCDIR@
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
-
-
 SHELL=/bin/sh
 
-
 include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
 CFLAGS = ${XCFLAGS}
 
-all: libnull.a
+all: install
+
+install: ${DESTDIR}/lib/afs/libnull.a
+
+${DESTDIR}/lib/afs/libnull.a: libnull.a
+       ${INSTALL} $? $@
 
 null.o: null.c AFS_component_version_number.o
 
@@ -29,8 +30,7 @@ libnull.a: null.o
        ar rv $@ null.o
        $(RANLIB) $@
 
-system install noversion install.noversion version: all
-       ${INSTALL} libnull.a ${DESTDIR}lib/afs
-
 clean:
        rm -f *.o *.a AFS_component_version_number.c
+
+include ../config/Makefile.version
index 7b68dee..53f226c 100644 (file)
@@ -13,12 +13,11 @@ SHELL    = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-INCLUDES = -I/usr/include -I${TOP_SRCDIR}/config -I${SRCDIR}include
+INCLUDES = -I/usr/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include
 DBGFLAG  = -UDEBUG
 CFLAGS   = ${DBUG} -DKFLAG -DANDREW -DVICE $(DBGFLAG) $(INCLUDES) $(XCFLAGS)
 YFLAGS   = -vd
 #LFLAGS  = -ll
-LINT     = lint -hp
 
 HFILES = package.h \
         validupdates.h \
@@ -61,13 +60,13 @@ TEST_OBJS = test.o \
        misc.o \
        globfuncs.o
 
-LIBS =  ${DESTDIR}lib/afs/libsys.a \
-        ${DESTDIR}lib/afs/libcmd.a \
-       ${DESTDIR}lib/afs/libcom_err.a \
-        ${DESTDIR}lib/librx.a \
-       ${DESTDIR}lib/afs/libsys.a \
-       ${DESTDIR}lib/afs/util.a \
-       ${DESTDIR}lib/liblwp.a \
+LIBS =  ${DESTDIR}/lib/afs/libsys.a \
+        ${DESTDIR}/lib/afs/libcmd.a \
+       ${DESTDIR}/lib/afs/libcom_err.a \
+        ${DESTDIR}/lib/librx.a \
+       ${DESTDIR}/lib/afs/libsys.a \
+       ${DESTDIR}/lib/afs/util.a \
+       ${DESTDIR}/lib/liblwp.a \
        ${XLIBS}
 
 include ../config/Makefile.version
@@ -83,10 +82,6 @@ package_test : $(TEST_OBJS)
 package.o: package.c AFS_component_version_number.o
 test.o: test.c AFS_component_version_number.o
 
-lint   : $(SRCS) gram.c lex.c test_gram.c
-       $(LINT) $(SRCS) gram.c lex.c test_gram.c
-       /bin/rm gram.c lex.c test_gram.c
-
 lex.c:
        -$(RM) -f lex.c
        $(LEX)  -t lex.l > lex.c
@@ -98,6 +93,6 @@ clean :
        AFS_component_version_number.c lex.c y.tab.h
 
 install: package package_test
-       $(INSTALL) -s  -c -m 755 package      ${DESTDIR}etc
-       $(INSTALL) -s  -c -m 755 package_test ${DESTDIR}etc
-       ${INSTALL} -ns -c -m 755 makepkgfiles ${DESTDIR}etc
+       $(INSTALL) -s  -c -m 755 package      ${DESTDIR}/etc
+       $(INSTALL) -s  -c -m 755 package_test ${DESTDIR}/etc
+       ${INSTALL} -ns -c -m 755 makepkgfiles ${DESTDIR}/etc
index 5f63cd5..54e6be5 100644 (file)
@@ -14,22 +14,22 @@ KERNELDIR = ../libafs/
 
 include ../config/Makefile.${SYS_NAME}
 
-LIBDIR = ${DESTDIR}lib/
-  LIBSA = ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a
-AFSLIBS = ${DESTDIR}lib/librxkad.a         \
-         ${LIBDIR}afs/libsys.a ${DESTDIR}lib/libdes.a      \
-         ${LIBDIR}librx.a ${LIBDIR}liblwp.a ${LIBDIR}afs/libaudit.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
+LIBDIR = ${DESTDIR}/lib/
+  LIBSA = ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a
+AFSLIBS = ${DESTDIR}/lib/librxkad.a        \
+         ${LIBDIR}/afs/libsys.a ${DESTDIR}/lib/libdes.a            \
+         ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a ${LIBDIR}/afs/libaudit.a \
+          ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a
 
 LDFLAGS = ${SHARE_LDFLAGS}
-   LIBS = ${LIBDIR}afs/libkauth.a ${LIBSA} ${LIBDIR}afs/libauth.a \
+   LIBS = ${LIBDIR}/afs/libkauth.a ${LIBSA} ${LIBDIR}/afs/libauth.a \
          ${AFSLIBS} ${PAMLIBS} @LIB_AFSDB@
-  KLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBSA} ${LIBDIR}afs/libauth.krb.a \
+  KLIBS = ${LIBDIR}/afs/libkauth.krb.a ${LIBSA} ${LIBDIR}/afs/libauth.krb.a \
          ${AFSLIBS} ${PAMLIBS} @LIB_AFSDB@
  SHOBJS = afs_auth.o afs_account.o afs_session.o afs_password.o \
          afs_pam_msg.o afs_message.o afs_util.o AFS_component_version_number.o
    OBJS = $(SHOBJS) test_pam.o
-INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}include \
+INCLUDES = -I${TOP_SRCDIR}/config -I${DESTDIR}/include \
        -I/usr/include -I/usr/include/sys
 CFLAGS =  ${DEBUG}  ${INCLUDES} ${PAM_CFLAGS}
 
@@ -98,8 +98,8 @@ clean:
        /bin/rm -f $(TARGETS) $(OBJS) afs_setcred.o afs_setcred_krb.o core *~ AFS_component_version_number.c
 
 install:       all
-       ${INSTALL} -s pam_afs.so.1 ${DESTDIR}lib/pam_afs.so.1
-       ${INSTALL} -s pam_afs.krb.so.1 ${DESTDIR}lib/pam_afs.krb.so.1
+       ${INSTALL} -s pam_afs.so.1 ${DESTDIR}/lib/pam_afs.so.1
+       ${INSTALL} -s pam_afs.krb.so.1 ${DESTDIR}/lib/pam_afs.krb.so.1
 
 afs_auth.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h
 afs_pam_msg.o: afs_pam_msg.c afs_pam_msg.h afs_message.h
index 6aaee98..4c26ba7 100644 (file)
@@ -5,25 +5,6 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-#                       All Rights Reserved
-# 
-# Permission to use, copy, modify, and distribute this software and its 
-# documentation for any purpose and without fee is hereby granted, 
-# provided that the above copyright notice appear in all copies and that
-# both that copyright notice and this permission notice appear in 
-# supporting documentation, and that the name of IBM not be
-# used in advertising or publicity pertaining to distribution of the
-# software without specific, written prior permission.  
-# 
-# IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-# ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-# IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-# ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-# SOFTWARE.
-######################################################################
-
 # Make modified install
 DESTDIR=@DESTDIR@
 SRCDIR=@SRCDIR@
@@ -35,45 +16,40 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 LIBS= ${XLIBS}
-CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config ${XCFLAGS}
+CFLAGS= ${OPTMZ} -g -I. -I${DESTDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS}
 
-include ../config/Makefile.version
+all: install
 
-pinstall: install.c  AFS_component_version_number.c 
+pinstall: install.c AFS_component_version_number.c 
        case ${SYS_NAME} in \
                 sgi_64 | sgi_65) \
-                        ${CC} -g -I${DESTDIR}include ${CFLAGS} install.c -o pinstall ${LIBS} ;; \
+                        ${CC} ${CFLAGS} install.c -o pinstall ${LIBS} ;; \
                 sgi_* ) \
-                        $(CC) -g -I${DESTDIR}include ${CFLAGS} install.c -o pinstall ${LIBS} -lmld ;; \
+                        ${CC} ${CFLAGS} install.c -o pinstall ${LIBS} -lmld ;; \
                 *) \
-                        $(CC) -g -I. -I${DESTDIR}include ${CFLAGS} install.c -o pinstall ${LIBS} ;; \
+                        ${CC} ${CFLAGS} install.c -o pinstall ${LIBS} ;; \
         esac
-       - [ -d test ] && ( cd test; $(MAKE) )
-       - [ -d test ] && ./test/test_install
 
-${DESTDIR}bin/install: pinstall
+test: pinstall
+       csh ./test/test_install
+
+${DESTDIR}/bin/install: pinstall
        case ${SYS_NAME} in \
                ppc_darwin*) \
-                       ./pinstall -f pinstall ${DESTDIR}bin/pinstall ;;\
+                       ./pinstall -f pinstall ${DESTDIR}/bin/pinstall ;;\
                *) \
-                       ./pinstall -f pinstall ${DESTDIR}bin/install ;;\
+                       ./pinstall -f pinstall ${DESTDIR}/bin/install ;;\
        esac
 
 # Note: Some rule needs to appear here so that OSF's make does not try to
 # compile install from install.c. A ";" will not work since other platforms
 # complain. That's why we use 'echo'.
-install: ${DESTDIR}bin/install
+install: ${DESTDIR}/bin/install
        @echo -n
 
-noversion: install
-
-kinstall ukinstall webinstall:
-       @echo No kernel source here.
-
-system: install
-
 clean:
-       rm -f pinstall AFS_component_version_number.c
+       rm -f *.o pinstall AFS_component_version_number.c
 
+include ../config/Makefile.version
 
 
index def0c21..deb58ac 100644 (file)
@@ -11,37 +11,37 @@ TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
 include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
 
-CFLAGS = $(DBUG) -I${SRCDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
+CFLAGS = $(DBUG) -I${SRCDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS}
 
-########################################################################
-# build libprocmgmt.a
-LIBOBJS=procmgmt_unix.o
+all: install
 
-libprocmgmt.a: ${LIBOBJS} AFS_component_version_number.o
+#
+# Build targets
+#
+libprocmgmt.a: procmgmt_unix.o AFS_component_version_number.o
        $(RM) -f libprocmgmt.a
-       $(AR) r libprocmgmt.a ${LIBOBJS} AFS_component_version_number.o
+       $(AR) r libprocmgmt.a procmgmt_unix.o AFS_component_version_number.o
        $(RANLIB) libprocmgmt.a
 
 procmgmt_unix.o: procmgmt_unix.c procmgmt.h
 
-#######################################################################
-system: install
-
-kinstall ukinstall webinstall: install
-       @echo No relevant source here.
-
-${DESTDIR}lib/afs/libprocmgmt.a: libprocmgmt.a
-       ${INSTALL}   $? $@
+#
+# Install targets
+#
+install: ${DESTDIR}/lib/afs/libprocmgmt.a \
+       ${DESTDIR}/include/afs/procmgmt.h
 
+${DESTDIR}/lib/afs/libprocmgmt.a: libprocmgmt.a
+       ${INSTALL} $? $@
 
-install: ${DESTDIR}lib/afs/libprocmgmt.a 
-       ${INSTALL} procmgmt.h ${DESTDIR}include/afs
-
-includes:
-       ${INSTALL} procmgmt.h ${DESTDIR}include/afs
+${DESTDIR}/include/afs/procmgmt.h: procmgmt.h
+       ${INSTALL} $? $@
 
+#
+# Misc targets
+#
 clean:
-       $(RM) -f *.o libprocmgmt.a   \
-        core  AFS_component_version_number.c
+       $(RM) -f *.a *.o core AFS_component_version_number.c
+
+include ../config/Makefile.version
index 124e59d..b452f18 100644 (file)
@@ -14,41 +14,41 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 UKERNELDIR=../libuafs/
-RXGEN=${SRCDIR}bin/rxgen
-COMPILE_ET = ${SRCDIR}bin/compile_et
+RXGEN=${SRCDIR}/bin/rxgen
+COMPILE_ET = ${SRCDIR}/bin/compile_et
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
-CFLAGS = $(DBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-INCLS=${SRCDIR}include/ubik.h \
-       ${SRCDIR}include/lock.h  \
-       ${SRCDIR}include/lwp.h \
-       ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h \
-       ${SRCDIR}include/afs/keys.h \
-       ${SRCDIR}include/afs/cellconfig.h \
+CFLAGS = $(DBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
+INCLS=${SRCDIR}/include/ubik.h \
+       ${SRCDIR}/include/lock.h  \
+       ${SRCDIR}/include/lwp.h \
+       ${SRCDIR}/include/rx/rx.h \
+       ${SRCDIR}/include/rx/xdr.h \
+       ${SRCDIR}/include/afs/keys.h \
+       ${SRCDIR}/include/afs/cellconfig.h \
        ptserver.h ptclient.h ptint.h ptopcodes.h pterror.h
 
-LINCLS=${SRCDIR}include/ubik.h \
-       ${SRCDIR}include/lock.h \
-       ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h  \
-       ${SRCDIR}include/rx/rxkad.h \
-       ${SRCDIR}include/afs/auth.h \
-       ${SRCDIR}include/afs/cellconfig.h \
+LINCLS=${SRCDIR}/include/ubik.h \
+       ${SRCDIR}/include/lock.h \
+       ${SRCDIR}/include/rx/rx.h \
+       ${SRCDIR}/include/rx/xdr.h  \
+       ${SRCDIR}/include/rx/rxkad.h \
+       ${SRCDIR}/include/afs/auth.h \
+       ${SRCDIR}/include/afs/cellconfig.h \
        ptclient.h ptint.h pterror.h
 
-LIBS =         ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/librxstat.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a \
-       ${SRCDIR}lib/afs/libsys.a 
+LIBS =         ${SRCDIR}/lib/libubik.a \
+       ${SRCDIR}/lib/afs/libauth.a \
+       ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/librxstat.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/libdes.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/util.a \
+       ${SRCDIR}/lib/afs/libsys.a 
 
-auditlib=${SRCDIR}lib/afs/libaudit.a
+auditlib=${SRCDIR}/lib/afs/libaudit.a
 
 LIBOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o
  
@@ -94,7 +94,7 @@ display.o: display.c ${INCLS}
 db_verify.o: db_verify.c ${INCLS} AFS_component_version_number.c
 
 db_verify: db_verify.o pterror.o display.o $(LIBS)
-       $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} ${SRCDIR}lib/afs/libcmd.a
+       $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} ${SRCDIR}/lib/afs/libcmd.a
 
 ptclient: ptclient.o display.o libprot.a $(LIBS)
        $(CC) ${CFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${XLIBS}
@@ -111,10 +111,10 @@ libprot.a: ${LIBOBJS} AFS_component_version_number.o
        $(AR) r libprot.a ${LIBOBJS} AFS_component_version_number.o
        $(RANLIB) libprot.a
 
-pts: pts.o libprot.a ${SRCDIR}lib/afs/libcmd.a $(LIBS)
-       $(CC) ${CFLAGS} -o pts pts.o ${SRCDIR}lib/afs/libcmd.a libprot.a ${LIBS} ${XLIBS}
+pts: pts.o libprot.a ${SRCDIR}/lib/afs/libcmd.a $(LIBS)
+       $(CC) ${CFLAGS} -o pts pts.o ${SRCDIR}/lib/afs/libcmd.a libprot.a ${LIBS} ${XLIBS}
 
-pts.o: pts.c ${LINCLS} ${SRCDIR}include/afs/cmd.h AFS_component_version_number.c
+pts.o: pts.c ${LINCLS} ${SRCDIR}/include/afs/cmd.h AFS_component_version_number.c
 
 readgroup: readgroup.o libprot.a $(LIBS)
        $(CC) ${CFLAGS} -o readgroup readgroup.o libprot.a ${LIBS} ${XLIBS}
@@ -126,15 +126,15 @@ readpwd: readpwd.o libprot.a $(LIBS)
 
 readpwd.o: readpwd.c ${LINCLS} AFS_component_version_number.c
 
-testpt: testpt.o libprot.a ${SRCDIR}lib/afs/libcmd.a $(LIBS)
+testpt: testpt.o libprot.a ${SRCDIR}/lib/afs/libcmd.a $(LIBS)
        case "$(SYS_NAME)" in \
        ppc_darwin_12 ) \
-               $(CC) ${CFLAGS} -o testpt testpt.o ${SRCDIR}lib/afs/libcmd.a libprot.a $(LIBS) ;; \
+               $(CC) ${CFLAGS} -o testpt testpt.o ${SRCDIR}/lib/afs/libcmd.a libprot.a $(LIBS) ;; \
        * ) \
-               $(CC) ${CFLAGS} -o testpt testpt.o -lm ${SRCDIR}lib/afs/libcmd.a libprot.a $(LIBS) ${XLIBS} ;; \
+               $(CC) ${CFLAGS} -o testpt testpt.o -lm ${SRCDIR}/lib/afs/libcmd.a libprot.a $(LIBS) ${XLIBS} ;; \
        esac
 
-testpt.o: testpt.c ${INCLS} ${SRCDIR}include/afs/cmd.h AFS_component_version_number.c
+testpt.o: testpt.c ${INCLS} ${SRCDIR}/include/afs/cmd.h AFS_component_version_number.c
 
 pt_util: pt_util.o ptutils.o ubik.o utils.o libprot.a $(LIBS)
        $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o libprot.a $(LIBS) ${XLIBS}
@@ -147,42 +147,42 @@ kinstall:
        @echo No $@ source here.
 
 ukinstall webinstall: ${UKSRCS} Kptint.h Kptint.cs.c Kptint.xdr.c
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} Kptint.h ${UKERNELDIR}afsint/ptint.h
-       ${INSTALL} Kptint.cs.c ${UKERNELDIR}afsint/ptint.cs.c
-       ${INSTALL} Kptint.xdr.c ${UKERNELDIR}afsint/ptint.xdr.c
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+       set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED)
+       ${INSTALL} Kptint.h ${UKERNELDIR}/afsint/ptint.h
+       ${INSTALL} Kptint.cs.c ${UKERNELDIR}/afsint/ptint.cs.c
+       ${INSTALL} Kptint.xdr.c ${UKERNELDIR}/afsint/ptint.xdr.c
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs
 
 all: ptclient libprot.a pts db_verify readgroup readpwd testpt pt_util
 
 ${DESTDIR}root.server/usr/afs/bin/ptserver: ptserver
        ${INSTALL} $? $@
 
-${DESTDIR}bin/pts ${DESTDIR}root.server/usr/afs/bin/pts: pts
+${DESTDIR}/bin/pts ${DESTDIR}root.server/usr/afs/bin/pts: pts
        ${INSTALL} $? $@
 
 ${DESTDIR}root.server/usr/afs/bin/pt_util: pt_util
        ${INSTALL} $? $@
 
-${DESTDIR}lib/afs/libprot.a: libprot.a
+${DESTDIR}/lib/afs/libprot.a: libprot.a
        ${INSTALL}   $? $@
 
 
-install: all ukinstall ${DESTDIR}root.server/usr/afs/bin/ptserver ${DESTDIR}root.server/usr/afs/bin/pts ${DESTDIR}bin/pts ${DESTDIR}lib/afs/libprot.a ${DESTDIR}root.server/usr/afs/bin/pt_util
-       ${INSTALL} libprot.a ${DESTDIR}lib/afs/libprot.a
-       ${INSTALL} ptserver.h ptint.h pterror.h ptclient.h ${DESTDIR}include/afs
-       ${INSTALL} ptserver.h ${DESTDIR}include/afs/prserver.h
-       ${INSTALL} ptint.h ${DESTDIR}include/afs/print.h
-       ${INSTALL} pterror.h ${DESTDIR}include/afs/prerror.h
-       ${INSTALL} ptclient.h ${DESTDIR}include/afs/prclient.h
-       ${INSTALL} -f db_verify ${DESTDIR}etc/prdb_check
-       echo '#define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_pt' >> ${DESTDIR}include/afs/prerror.h
-
-libinstall: ${DESTDIR}lib/afs/libprot.a
-       ${INSTALL} libprot.a ${DESTDIR}lib/afs/libprot.a
-       ${INSTALL} ptserver.h ptint.h pterror.h ptclient.h ${DESTDIR}include/afs
-       ${INSTALL} ptserver.h ${DESTDIR}include/afs/prserver.h
-       ${INSTALL} ptint.h ${DESTDIR}include/afs/print.h
-       ${INSTALL} pterror.h ${DESTDIR}include/afs/prerror.h
-       ${INSTALL} ptclient.h ${DESTDIR}include/afs/prclient.h
+install: all ukinstall ${DESTDIR}root.server/usr/afs/bin/ptserver ${DESTDIR}root.server/usr/afs/bin/pts ${DESTDIR}/bin/pts ${DESTDIR}/lib/afs/libprot.a ${DESTDIR}root.server/usr/afs/bin/pt_util
+       ${INSTALL} libprot.a ${DESTDIR}/lib/afs/libprot.a
+       ${INSTALL} ptserver.h ptint.h pterror.h ptclient.h ${DESTDIR}/include/afs
+       ${INSTALL} ptserver.h ${DESTDIR}/include/afs/prserver.h
+       ${INSTALL} ptint.h ${DESTDIR}/include/afs/print.h
+       ${INSTALL} pterror.h ${DESTDIR}/include/afs/prerror.h
+       ${INSTALL} ptclient.h ${DESTDIR}/include/afs/prclient.h
+       ${INSTALL} -f db_verify ${DESTDIR}/etc/prdb_check
+       echo '#define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_pt' >> ${DESTDIR}/include/afs/prerror.h
+
+libinstall: ${DESTDIR}/lib/afs/libprot.a
+       ${INSTALL} libprot.a ${DESTDIR}/lib/afs/libprot.a
+       ${INSTALL} ptserver.h ptint.h pterror.h ptclient.h ${DESTDIR}/include/afs
+       ${INSTALL} ptserver.h ${DESTDIR}/include/afs/prserver.h
+       ${INSTALL} ptint.h ${DESTDIR}/include/afs/print.h
+       ${INSTALL} pterror.h ${DESTDIR}/include/afs/prerror.h
+       ${INSTALL} ptclient.h ${DESTDIR}/include/afs/prclient.h
 
index b48063f..9e46749 100644 (file)
@@ -29,13 +29,13 @@ SRCS=       rcp.c
 OBJS=   rcp.o ../rsh/rcmd.o ../rsh/herror.o ../inetd/ta-rauth.o
 
 
-CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XCFLAGS}
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}libubik.a\
-                  ${LIBDIR}afs/libauth.a ${LIBDIR}afs/libsys.a \
-                  ${LIBDIR}librx.a ${LIBDIR}liblwp.a ${DESTDIR}lib/librxkad.a\
-                  ${DESTDIR}lib/libdes.a ${LIBDIR}afs/libcmd.a \
-                  ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a 
+CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}/include ${XCFLAGS}
+LIBDIR = ${DESTDIR}/lib/
+AFSLIBS =  ${LIBDIR}/afs/libkauth.a ${LIBDIR}/libubik.a\
+                  ${LIBDIR}/afs/libauth.a ${LIBDIR}/afs/libsys.a \
+                  ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a ${DESTDIR}/lib/librxkad.a\
+                  ${DESTDIR}/lib/libdes.a ${LIBDIR}/afs/libcmd.a \
+                  ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a 
 LIBRES = 
 LIBS = ${AFSLIBS} ${LIBRES} 
 MAN=
@@ -77,10 +77,4 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN} all
-       ${INSTALL} rcp ${DESTDIR}bin/rcp
-
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
+       ${INSTALL} rcp ${DESTDIR}/bin/rcp
index 385e57f..cf94f96 100644 (file)
@@ -29,17 +29,17 @@ LIBC=       /lib/libc.a
 SRCS=  rlogind.c ../rsh/rcmd.c ../rsh/herror.c ../inetd/ta-rauth.c
 OBJS=  rlogind.o ../rsh/rcmd.o ../rsh/herror.o ../inetd/ta-rauth.o
 MAN=
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a\
-                  ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-                  ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-                  ${LIBDIR}afs/libsys.a \
-                  ${DESTDIR}lib/librxkad.a ${DESTDIR}lib/libdes.a \
-                  ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a ${LIBDIR}afs/libaudit.a
+LIBDIR = ${DESTDIR}/lib/
+AFSLIBS =  ${LIBDIR}/afs/libkauth.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a\
+                  ${LIBDIR}/afs/libauth.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \
+                  ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \
+                  ${LIBDIR}/afs/libsys.a \
+                  ${DESTDIR}/lib/librxkad.a ${DESTDIR}/lib/libdes.a \
+                  ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a ${LIBDIR}/afs/libaudit.a
 RES = 
 LIBS = ../login/libutil.a ${RES} ${AFSLIBS}
 ALIBS= ${AFSLIBS} 
-CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}include ${XCFLAGS}
+CFLAGS= ${OPTMZ} -I${TOP_SRCDIR}/config -I${DESTDIR}/include ${XCFLAGS}
 
 include ../config/Makefile.version
 
@@ -87,11 +87,5 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN} all
-       ${INSTALL} -s -m 755 rlogind ${DESTDIR}etc/rlogind
-       ${INSTALL} -s -m 755 rexecd ${DESTDIR}etc/rexecd
-
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
+       ${INSTALL} -s -m 755 rlogind ${DESTDIR}/etc/rlogind
+       ${INSTALL} -s -m 755 rexecd ${DESTDIR}/etc/rexecd
index 9c78f32..8558fa6 100644 (file)
@@ -25,19 +25,19 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-LIBDIR = ${DESTDIR}lib/
-INCLUDES= -I${TOP_SRCDIR}/config -I${SRCDIR}include
+LIBDIR = ${DESTDIR}/lib/
+INCLUDES= -I${TOP_SRCDIR}/config -I${SRCDIR}/include
 CFLAGS=        ${DBUG} ${INCLUDES} ${XCFLAGS}
 LIBC=  /lib/libc.a
 OBJS=   rcmd.o ../inetd/ta-rauth.o herror.o
 MAN=   
 SRCS=  rsh.c rcmd.c ../inetd/ta-rauth.c herror.c AFS_component_version_number.c
-AFSLIBS =  ${LIBDIR}afs/libkauth.a ${LIBDIR}libubik.a\
-           ${LIBDIR}afs/libauth.a ${LIBDIR}afs/libsys.a \
-           ${LIBDIR}librx.a ${LIBDIR}liblwp.a ${DESTDIR}lib/librxkad.a\
-          ${LIBDIR}afs/libsys.a \
-           ${DESTDIR}lib/libdes.a ${LIBDIR}afs/libcmd.a \
-           ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
+AFSLIBS =  ${LIBDIR}/afs/libkauth.a ${LIBDIR}/libubik.a\
+           ${LIBDIR}/afs/libauth.a ${LIBDIR}/afs/libsys.a \
+           ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a ${DESTDIR}/lib/librxkad.a\
+          ${LIBDIR}/afs/libsys.a \
+           ${DESTDIR}/lib/libdes.a ${LIBDIR}/afs/libcmd.a \
+           ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a
 LIBS = ${AFSLIBS} 
 
 include ../config/Makefile.version
@@ -73,13 +73,7 @@ install: ${MAN} all
        set -x; \
        case "${SYS_NAME}" in \
        hp* ) \
-               ${INSTALL} -m 4755 -f rsh ${DESTDIR}bin/remsh ;; \
+               ${INSTALL} -m 4755 -f rsh ${DESTDIR}/bin/remsh ;; \
        * ) \
-               ${INSTALL} -m 4755 rsh ${DESTDIR}bin/rsh ;; \
+               ${INSTALL} -m 4755 rsh ${DESTDIR}/bin/rsh ;; \
        esac
-
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
index a6babcc..a39a27c 100644 (file)
@@ -17,10 +17,8 @@ include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
-#CC=pcc
-CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include -DRXDEBUG ${XCFLAGS}
+CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include -DRXDEBUG ${XCFLAGS}
 
 #
 # Generic xdr objects (or, at least, xdr stuff that's not newly defined for rx).
@@ -38,24 +36,19 @@ LIBOBJS = ${RXOBJS} ${MULTIOBJS} ${XDROBJS}
 
 LIBOBJS_djgpp = ${RXOBJS_djgpp} ${MULTIOBJS} ${XDROBJS_djgpp}
 
-XMIT = rx_xmit_nt.o
-XMIT_H = rx_xmit_nt.h
-
 XDROBJS_djgpp = xdr.o xdr_rec.o xdr_stdio.o \
        xdr_float.o  xdr_refernce.o  xdr_update.o \
        xdr_array.o xdr_mem.o xdr_rx.o xdr_afsuuid.o
 
 RXOBJS_djgpp = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o rx_globals.o \
                rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o  rx_trace.o rx_conncache.o \
-               xdr_int64.o $(XMIT)
+               xdr_int64.o rx_xmit_nt.o
 
-BASICINCLS = ${SRCDIR}include/lwp.h ${SRCDIR}include/lock.h \
+BASICINCLS = ${SRCDIR}/include/lwp.h ${SRCDIR}/include/lock.h \
             rx_clock.h rx_queue.h rx_event.h
 
-LIBS = librx.a ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/libcmd.a \
-              ${SRCDIR}lib/afs/util.a 
-
-LINK = ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} ${SRCDIR}lib/afs/libsys.a ${XLIBS}
+LIBS = librx.a ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/libcmd.a \
+              ${SRCDIR}/lib/afs/util.a 
 
 KSRCS = rx.c rx.h rx_clock.c rx_clock.h rx_event.c rx_event.h \
        rx_globals.c rx_globals.h rx_kernel.h rx_misc.h \
@@ -65,17 +58,13 @@ KSRCS = rx.c rx.h rx_clock.c rx_clock.h rx_event.c rx_event.h \
        xdr_afsuuid.c rx_trace.h xdr_int64.c
 UKSRCS = $(KSRCS) rx_conncache.c
 
-include ../config/Makefile.version
-
-test tests: install ${DESTDIR}etc/rxdebug rxdumptrace 
+all: install
 
 RX_component_version_number.c: AFS_component_version_number.c
        sed 's/cml_version/rx_cml_version/' <AFS_component_version_number.c >RX_component_version_number.c
 
 RX_component_version_number.o: RX_component_version_number.c
 
-xdrs: ${XDROBJS}
-
 ${RXOBJS}: ${BASICINCLS} rx.h rx_user.h rx_globals.h
 
 ${MULTIOBJS}: rx.h rx_multi.h
@@ -89,7 +78,6 @@ rxdebug.o: rxdebug.c
 rx_packet.o: rx_packet.c rx_packet.h
 
 rx_rdwr.o: rx_rdwr.c rx.h
-#      $(CC) -c -O -I${SRCDIR}include -DRXDEBUG ${XCFLAGS} rx_rdwr.c
 
 rx.o: rx.h rx_user.h
 
@@ -110,51 +98,119 @@ xdr_rx.o: xdr.h rx.h
 
 xdr_refernce.o: xdr_refernce.c xdr.h
 
-#rx_vab.o: rx_vab.c rx_vab.h rx_user.h ${BASICINCLS}
-
 librx.a: ${LIBOBJS} RX_component_version_number.o
        -rm -f $@
        $(AR) rv $@ RX_component_version_number.o ${LIBOBJS}
        $(RANLIB) $@
 
-librx-djgpp: ${LIBOBJS_djgpp} RX_component_version_number.o
-       -rm -f librx.a
-       $(AR) rv librx.a RX_component_version_number.o ${LIBOBJS_djgpp}
-       $(RANLIB) librx.a
+librx-djgpp.a: ${LIBOBJS_djgpp} RX_component_version_number.o
+       -rm -f librx-djgpp.a
+       $(AR) rv librx-djgpp.a RX_component_version_number.o ${LIBOBJS_djgpp}
+       $(RANLIB) librx-djgpp.a
 
-${DESTDIR}etc/rxdebug: rxdebug
-       ${INSTALL} rxdebug ${DESTDIR}etc/rxdebug
+${DESTDIR}/etc/rxdebug: rxdebug
+       ${INSTALL} rxdebug ${DESTDIR}/etc/rxdebug
 
-rxdebug: rxdebug.o ${DESTDIR}lib/afs/util.a ${DESTDIR}lib/afs/libsys.a
-       ${LINK}
+rxdebug: rxdebug.o ${DESTDIR}/lib/afs/util.a ${DESTDIR}/lib/afs/libsys.a
+       ${CC} ${CFLAGS} -o $@ $@.o ${LIBS} ${SRCDIR}/lib/afs/libsys.a ${XLIBS}
 
-install.noversion noversion install all system: librx.a includes kinstall ukinstall
-       ${INSTALL} librx.a ${DESTDIR}lib
+#
+# Install targets
+#
+install: includes kinstall ukinstall \
+       ${DESTDIR}/lib/librx.a
+
+includes: \
+       ${DESTDIR}/include/rx \
+       ${DESTDIR}/include/rx/rx_packet.h \
+       ${DESTDIR}/include/rx/rx.h \
+       ${DESTDIR}/include/rx/rx_user.h \
+       ${DESTDIR}/include/rx/rx_event.h \
+       ${DESTDIR}/include/rx/rx_queue.h \
+       ${DESTDIR}/include/rx/rx_globals.h \
+       ${DESTDIR}/include/rx/rx_clock.h \
+       ${DESTDIR}/include/rx/rx_multi.h \
+       ${DESTDIR}/include/rx/rx_pthread.h \
+       ${DESTDIR}/include/rx/rx_lwp.h \
+       ${DESTDIR}/include/rx/rx_misc.h \
+       ${DESTDIR}/include/rx/rx_null.h \
+       ${DESTDIR}/include/rx/xdr.h 
+
+kinstall: ${KERNELDIR}/rx
+       $(INSTALL) $(MKAFS_OSTYPE)/*.[ch] $(KERNELDIR)rx
+       $(INSTALL) $(KSRCS) $(KERNELDIR)rx
 
-install-djgpp: librx-djgpp includes includes-djgpp kinstall ukinstall
-       ${INSTALL} librx.a ${DESTDIR}lib
+ukinstall: ${UKERNELDIR}/rx
+       $(INSTALL) $(UKSRCS) $(UKERNELDIR)rx
+       -$(INSTALL) UKERNEL/*.[ch] $(UKERNELDIR)rx
 
-includes-djgpp: $(XMIT_H)
-       set ${DESTDIR}include/rx; $(MKDIR_IF_NEEDED)
-       ${INSTALL} $(XMIT_H) ${DESTDIR}include/rx
+${DESTDIR}/include/rx/rx_packet.h: rx_packet.h
+       ${INSTALL} $? $@
 
-includes: rx.h rx_user.h rx_event.h rx_queue.h rx_clock.h xdr.h rx_null.h rx_globals.h 
-       set ${DESTDIR}include/rx; $(MKDIR_IF_NEEDED)
-       ${INSTALL} rx_packet.h rx.h rx_user.h rx_event.h rx_queue.h \
-       rx_globals.h \
-       rx_clock.h rx_multi.h ${DESTDIR}include/rx
-       ${INSTALL} xdr.h rx_null.h ${DESTDIR}include/rx
-       ${INSTALL} rx_pthread.h rx_lwp.h rx_misc.h ${DESTDIR}include/rx
+${DESTDIR}/include/rx/rx.h: rx.h
+       ${INSTALL} $? $@
 
-kinstall: includes
-       set $(KERNELDIR)rx; $(MKDIR_IF_NEEDED)
-       $(INSTALL) $(KSRCS) $(KERNELDIR)rx
-       $(INSTALL) $(MKAFS_OSTYPE)/*.[ch] $(KERNELDIR)rx
+${DESTDIR}/include/rx/rx_user.h: rx_user.h
+       ${INSTALL} $? $@
 
-ukinstall webinstall: includes
-       set $(UKERNELDIR)rx; $(MKDIR_IF_NEEDED)
-       $(INSTALL) $(UKSRCS) $(UKERNELDIR)rx
-       -$(INSTALL) UKERNEL/*.[ch] $(UKERNELDIR)rx
+${DESTDIR}/include/rx/rx_event.h: rx_event.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/rx/rx_queue.h: rx_queue.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/rx/rx_globals.h: rx_globals.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/rx/rx_clock.h: rx_clock.h
+       ${INSTALL} $? $@
 
+${DESTDIR}/include/rx/rx_multi.h: rx_multi.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/rx/rx_pthread.h: rx_pthread.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/rx/rx_lwp.h: rx_lwp.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/rx/rx_misc.h: rx_misc.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/rx/rx_null.h: rx_null.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/rx/xdr.h: xdr.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx:
+       mkdir -p ${UKERNELDIR}/rx
+
+${KERNELDIR}/rx:
+       mkdir -p ${KERNELDIR}/rx
+
+install-djgpp: includes kinstall ukinstall librx-djgpp ${DESTDIR}/include/rx/rx_xmit_nt.h ${DESTDIR}/lib/librx-djgpp.a
+
+${DESTDIR}/lib/librx.a: librx.a
+       ${INSTALL} $? $@
+
+# rule will never be satisfied
+${DESTDIR}/lib/librx-djgpp.a: librx-djgpp.a
+       ${INSTALL} $? ${DESTdIR}/lib/librx.a
+
+${DESTDIR}/include/rx:
+       mkdir -p ${DESTDIR}/include/rx
+
+${DESTDIR}/include/rx/rx_xmit_nt.h: rx_xmit_nt.h ${DESTDIR}/include/rx
+       ${INSTALL} $? $@
+
+#
+# Misc. targets
+#
 clean:
        rm -f *.o *.a core *_component_version_number.c rxdumptrace rxdebug
+
+include ../config/Makefile.version
+
+test tests: install ${DESTDIR}/etc/rxdebug rxdumptrace 
+
index 1a0f9e7..45a0573 100644 (file)
@@ -11,11 +11,11 @@ TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
 SRCDIR=/usr/andy/
-LIBRX=${SRCDIR}lib/librx.a
+LIBRX=${SRCDIR}/lib/librx.a
 DESTDIR=/usr/andy/
-INSTALL=${SRCDIR}bin/install
-LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
-CFLAGS=-g -I.. -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
+INSTALL=${SRCDIR}/bin/install
+LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
+CFLAGS=-g -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
 
 all: bulk_client bulk_server
 
index 1a0f9e7..45a0573 100644 (file)
@@ -11,11 +11,11 @@ TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
 SRCDIR=/usr/andy/
-LIBRX=${SRCDIR}lib/librx.a
+LIBRX=${SRCDIR}/lib/librx.a
 DESTDIR=/usr/andy/
-INSTALL=${SRCDIR}bin/install
-LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
-CFLAGS=-g -I.. -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
+INSTALL=${SRCDIR}/bin/install
+LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
+CFLAGS=-g -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
 
 all: bulk_client bulk_server
 
index 76f06d1..bb7ac9c 100644 (file)
@@ -11,11 +11,11 @@ TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
 SRCDIR=/usr/andy/
-LIBRX=${SRCDIR}lib/librx.a
+LIBRX=${SRCDIR}/lib/librx.a
 DESTDIR=/usr/andy/
-INSTALL=${SRCDIR}bin/install
-LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
-CFLAGS=-g -I.. -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
+INSTALL=${SRCDIR}/bin/install
+LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
+CFLAGS=-g -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
 
 all: sample_client sample_server
 
index 688d785..1fab2e5 100644 (file)
@@ -11,11 +11,11 @@ TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
 SRCDIR=/usr/andy/
-LIBRX=${SRCDIR}lib/librx.a
+LIBRX=${SRCDIR}/lib/librx.a
 DESTDIR=/usr/andy/
-INSTALL=${SRCDIR}bin/install
-LIBS=${LIBRX} ${SRCDIR}lib/liblwp.a
-CFLAGS=-g -I. -I${SRCDIR}include -DDEBUG ${XCFLAGS}
+INSTALL=${SRCDIR}/bin/install
+LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
+CFLAGS=-g -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
 
 all: sample_client sample_server
 
index fb2da46..87b9825 100644 (file)
@@ -14,9 +14,9 @@ SYS_NAME=@AFS_SYSNAME@
 include ../../config/Makefile.${SYS_NAME}
 OPTIMIZE=-g
 
-INCDIRS= -I${DESTDIR}include -I.. 
-LDIRS= -L.. -L${DESTDIR}lib -L${DESTDIR}lib/afs  
-LIBS= ${DESTDIR}lib/afs/libcmd.a  ../librx.a ${DESTDIR}lib/liblwp.a \
+INCDIRS= -I${DESTDIR}/include -I.. 
+LDIRS= -L.. -L${DESTDIR}/lib -L${DESTDIR}/lib/afs  
+LIBS= ${DESTDIR}/lib/afs/libcmd.a  ../librx.a ${DESTDIR}/lib/liblwp.a \
         ${DESTDIR}/lib/util.a ${DESTDIR}/lib/afs/libsys.a ${XLIBS}
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} -DRXDEBUG ${LDIRS} ${LIBS} ${XCFLAGS}
index cb48bf1..884c8a0 100644 (file)
@@ -23,83 +23,34 @@ OBJS= rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o rpc_scan.o rpc_util.o \
        rpc_svcout.o rpc_clntout.o
 
 GOAL=rxgen
-CFLAGS = ${DBUG} -I. -I${DESTDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
+CFLAGS = -I. -I${DESTDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS}
 
-USNS=cellname
-SD=../../../src/CML
-VN=AFS_component_version_number
-ID=``
+all: install
 
-include ../config/Makefile.version
-
-$(VN).o: $(VN).c
-
-.c.o:
-       $(SPEW) $(CC) $(CFLAGS) -c $<
-
-$(GOAL): $(OBJS) AFS_component_version_number.c
-       $(SPEW) $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@
+rxgen: $(OBJS) AFS_component_version_number.c
+       $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@
 
-all:   $(GOAL)
+install: ukinstall \
+       ${DESTDIR}/bin/rxgen \
+       ${DESTDIR}/include/afs/rxgen_consts.h
 
-system: install0
+ukinstall: \
+       ${UKERNELDIR}/afs \
+       ${UKERNELDIR}/afs/rxgen_consts.h
 
-kinstall: install0
+${UKERNELDIR}/afs:
+       mkdir -p ${UKERNELDIR}/afs
 
-ukinstall webinstall: install0
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       $(INSTALL) rxgen_consts.h $(UKERNELDIR)afs
+${UKERNELDIR}/afs/rxgen_consts.h: rxgen_consts.h
+       ${INSTALL} $? $@
 
-$(DESTDIR)/bin/$(GOAL): $(GOAL)
-       @echo "Installing the Rx Protocol Compiler (rxgen)"
-       $(INSTALL) rxgen $(DESTDIR)bin
+${DESTDIR}/bin/rxgen: rxgen
+       ${INSTALL} $? $@
 
-install0: $(DESTDIR)/bin/$(GOAL)
-       $(INSTALL) rxgen_consts.h $(DESTDIR)include/afs
-
-install: install0 ukinstall
-
-lint: $(SRCS) $(HDRS)
-       lint $(SRCS)
+${DESTDIR}/include/afs/rxgen_consts.h: rxgen_consts.h
+       ${INSTALL} $? $@
 
 clean:
-       rm -f $(GOAL) $(OBJS) core AFS_component_version_number.c
+       rm -f *.o rxgen core AFS_component_version_number.c
 
-depend: $(SRCS) $(HDRS)
-       @${CC} ${CFLAGS} -M ${SRCS} > makedep
-       @echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
-       @echo '$$r makedep' >>eddep
-       @echo 'w' >>eddep
-       @cp Makefile makefile.bak
-       @ed - Makefile < eddep
-       @rm eddep makedep makefile.bak
-
-rpc_main.o: AFS_component_version_number.c
-# DO NOT DELETE THIS LINE
-rpc_main.o: rpc_main.c 
-rpc_main.o: ./rpc_util.h
-rpc_main.o: ./rpc_parse.h
-rpc_main.o: ./rpc_scan.h
-rpc_hout.o: rpc_hout.c
-rpc_hout.o: ./rpc_util.h
-rpc_hout.o: ./rpc_parse.h
-rpc_cout.o: rpc_cout.c
-rpc_cout.o: ./rpc_util.h
-rpc_cout.o: ./rpc_parse.h
-rpc_parse.o: rpc_parse.c
-rpc_parse.o: ./rpc_util.h
-rpc_parse.o: ./rpc_scan.h
-rpc_parse.o: ./rpc_parse.h
-rpc_scan.o: rpc_scan.c
-rpc_scan.o: ./rpc_scan.h
-rpc_scan.o: ./rpc_util.h
-rpc_util.o: rpc_util.c
-rpc_util.o: ./rpc_scan.h
-rpc_util.o: ./rpc_parse.h
-rpc_util.o: ./rpc_util.h
-rpc_svcout.o: rpc_svcout.c
-rpc_svcout.o: ./rpc_parse.h
-rpc_svcout.o: ./rpc_util.h
-rpc_clntout.o: rpc_clntout.c
-rpc_clntout.o: ./rpc_parse.h
-rpc_clntout.o: ./rpc_util.h
+include ../config/Makefile.version
index 9c32f56..4ebf13e 100644 (file)
@@ -18,36 +18,134 @@ include ../config/Makefile.${SYS_NAME}
 
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
-COMPILE_ET = ${SRCDIR}bin/compile_et
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+COMPILE_ET = ${SRCDIR}/bin/compile_et
 
-CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-INCLS= ${SRCDIR}include/rx/rx.h \
-       ${SRCDIR}include/rx/xdr.h \
+CFLAGS = ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
+INCLS= ${SRCDIR}/include/rx/rx.h ${SRCDIR}/include/rx/xdr.h \
        rxkad.h
 
-OBJS= rxkad_client.o rxkad_server.o rxkad_common.o ticket.o rxkad_errs.o
+OBJS=rxkad_client.o rxkad_server.o rxkad_common.o ticket.o rxkad_errs.o \
+       fcrypt.o crypt_conn.o
 
-REGOBJS=fcrypt.o crypt_conn.o
+all: install
 
-KSRCS=private_data.h fcrypt.h fcrypt.c crypt_conn.c rxkad_client.c rxkad_common.c rxkad.h sboxes.h
+#
+# Install targets
+#
+kinstall: \
+       ${KERNELDIR}/afs/private_data.h \
+       ${KERNELDIR}/afs/rxkad.h \
+       ${KERNELDIR}/afs/sboxes.h \
+       ${KERNELDIR}/afs/fcrypt.h \
+       ${KERNELDIR}/afs/fcrypt.c \
+       ${KERNELDIR}/afs/crypt_conn.c \
+       ${KERNELDIR}/afs/rxkad_client.c \
+       ${KERNELDIR}/afs/rxkad_common.c 
 
-UKSRCS=$(KSRCS) rxkad.h ticket.c rxkad_server.c lifetimes.h private_data.h rxkad_errs.c
+${KERNELDIR}/afs/private_data.h: private_data.h
+       ${INSTALL} $? $@
 
-include ../config/Makefile.version
+${KERNELDIR}/afs/rxkad.h: rxkad.h
+       ${INSTALL} $? $@
 
-noversion: install
+${KERNELDIR}/afs/sboxes.h: sboxes.h
+       ${INSTALL} $? $@
 
-all: librxkad.a
+${KERNELDIR}/afs/fcrypt.h: fcrypt.h
+       ${INSTALL} $? $@
 
-system: install
+${KERNELDIR}/afs/fcrypt.c: fcrypt.c
+       ${INSTALL} $? $@
 
-clean: 
-       rm -f *.o tcrypt core *.a rxkad_errs.c rxkad.h AFS_component_version_number.c crypt_conn.c fcrypt.c fcrypt.h sboxes.h
+${KERNELDIR}/afs/crypt_conn.c: crypt_conn.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/afs/rxkad_client.c: rxkad_client.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/afs/rxkad_common.c: rxkad_common.c
+       ${INSTALL} $? $@
+
+ukinstall: \
+       ${UKERNELDIR}/afs \
+       ${UKERNELDIR}/rx \
+       ${UKERNELDIR}/afs/private_data.h \
+       ${UKERNELDIR}/afs/rxkad.h \
+       ${UKERNELDIR}/rx/rxkad.h \
+       ${UKERNELDIR}/afs/sboxes.h \
+       ${UKERNELDIR}/afs/fcrypt.h \
+       ${UKERNELDIR}/afs/fcrypt.c \
+       ${UKERNELDIR}/afs/crypt_conn.c \
+       ${UKERNELDIR}/afs/rxkad_client.c \
+       ${UKERNELDIR}/afs/rxkad_common.c \
+       ${UKERNELDIR}/afs/ticket.c \
+       ${UKERNELDIR}/afs/rxkad_server.c \
+       ${UKERNELDIR}/afs/lifetimes.h \
+       ${UKERNELDIR}/afs/rxkad_errs.c 
+
+
+${UKERNELDIR}/afs:
+       mkdir -p $?
+
+${UKERNELDIR}/rx:
+       mkdir -p $?
+
+${UKERNELDIR}/afs/private_data.h: private_data.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/rxkad.h: rxkad.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/rx/rxkad.h: rxkad.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/lifetimes.h: lifetimes.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/ticket.c: ticket.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/sboxes.h: sboxes.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/fcrypt.h: fcrypt.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/fcrypt.c: fcrypt.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/crypt_conn.c: crypt_conn.c
+       ${INSTALL} $? $@
 
-librxkad.a: $(OBJS) ${REGOBJS} AFS_component_version_number.o
+${UKERNELDIR}/afs/rxkad_client.c: rxkad_client.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/rxkad_errs.c: rxkad_errs.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/rxkad_server.c: rxkad_server.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/rxkad_common.c: rxkad_common.c
+       ${INSTALL} $? $@
+
+install: kinstall ukinstall \
+       ${DESTDIR}/lib/librxkad.a \
+       ${DESTDIR}/include/rx/rxkad.h
+
+${DESTDIR}/lib/librxkad.a: librxkad.a
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/rx/rxkad.h: rxkad.h
+       ${INSTALL} $? $@
+
+#
+# Build targets
+#
+
+librxkad.a: ${OBJS} AFS_component_version_number.o
        -rm -f librxkad.a
-       $(AR) rv librxkad.a $(OBJS) ${REGOBJS} AFS_component_version_number.o
+       $(AR) rv librxkad.a ${OBJS} AFS_component_version_number.o
        $(RANLIB) librxkad.a
 
 crypt_conn.o: fcrypt.h private_data.h crypt_conn.c ${INCLS}
@@ -61,53 +159,47 @@ rxkad_common.o: fcrypt.h private_data.h rxkad_common.c ${INCLS}
 rxkad_errs.o: rxkad_errs.c
 
 rxkad_errs.c rxkad.h: rxkad_errs.et rxkad.p.h
-       rm -f rxkad.h rxkad_errs.c; ${COMPILE_ET} rxkad_errs -h rxkad
+       rm -f rxkad.h rxkad_errs.c
+       ${COMPILE_ET} rxkad_errs -h rxkad
 
 ticket.o: ticket.c lifetimes.h ${INCLS}
 
 fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h
        ${CC} ${CFLAGS} -c fcrypt.c
 
-kinstall: ${KSRCS}
-       ${INSTALL} $(KSRCS) ${KERNELDIR}afs
-
-ukinstall webinstall: ${UKSRCS}
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       set ${UKERNELDIR}rx; $(MKDIR_IF_NEEDED)
-       ${INSTALL} $(UKSRCS) ${UKERNELDIR}afs
-       ${INSTALL} rxkad.h ${UKERNELDIR}rx
-
-install: all kinstall ukinstall
-       rm -f ${DESTDIR}lib/librxkad.a
-       ${INSTALL} librxkad.a ${DESTDIR}lib
-       ${INSTALL} rxkad.h ${DESTDIR}include/rx
-
 tcrypt: tcrypt.o librxkad.a 
        ${CC} -o tcrypt tcrypt.o librxkad.a
+
 tcrypt.o: tcrypt.c AFS_component_version_number.o
 
+#
+# Misc. targets
+#
+
+clean: 
+       rm -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \
+               AFS_component_version_number.c \
+               crypt_conn.c fcrypt.c fcrypt.h sboxes.h
+
 test:
        cd test; $(MAKE)
 
 # These sources are kept in a separate directory so that we can use an
 # ACL to comply with source export restrictions.
 
-crypt_conn.c:  domestic/crypt_conn.c
-       rm -f $@
-       cp domestic/crypt_conn.c $@
+crypt_conn.c: domestic/crypt_conn.c
+       ${INSTALL} $? $@
 
-fcrypt.c:      domestic/fcrypt.c
-       rm -f $@
-       cp domestic/fcrypt.c $@
+fcrypt.c: domestic/fcrypt.c
+       ${INSTALL} $? $@
 
-fcrypt.h:      domestic/fcrypt.h
-       rm -f $@
-       cp domestic/fcrypt.h $@
+fcrypt.h: domestic/fcrypt.h
+       ${INSTALL} $? $@
 
-sboxes.h:      domestic/sboxes.h
-       rm -f $@
-       cp domestic/sboxes.h $@
+sboxes.h: domestic/sboxes.h
+       ${INSTALL} $? $@
 
-tcrypt.c:      domestic/tcrypt.c
-       rm -f $@
-       cp domestic/tcrypt.c $@
+tcrypt.c: domestic/tcrypt.c
+       ${INSTALL} $? $@
+
+include ../config/Makefile.version
index 851df14..4141637 100644 (file)
@@ -15,18 +15,18 @@ include ../../config/Makefile.${SYS_NAME}
 
 OPTIMIZE=-g
 
-INCDIRS= -I${DESTDIR}include -I.. -I${BACKDIR}include
+INCDIRS= -I${DESTDIR}/include -I.. -I${BACKDIR}/include
 
 HEADERS = ../rxkad.h stress.h stress_internal.h stress_errs.h
 
-LDIR= ${DESTDIR}lib/
-ULIBS = ${LDIR}afs/libcmd.a ${LDIR}afs/libcom_err.a ${DESTDIR}lib/afs/util.a
+LDIR= ${DESTDIR}/lib/
+ULIBS = ${LDIR}/afs/libcmd.a ${LDIR}/afs/libcom_err.a ${DESTDIR}/lib/afs/util.a
 
-LIBS = ../librxkad.a  ${LDIR}librx.a ${LDIR}libdes.a \
-       ${LDIR}liblwp.a  ${ULIBS} ${XLIBS}
+LIBS = ../librxkad.a  ${LDIR}/librx.a ${LDIR}/libdes.a \
+       ${LDIR}/liblwp.a  ${ULIBS} ${XLIBS}
 
 LIBRPC = ../../librpc/libafsrpc.so
-THLIBS= ${LDIR}afs/libcmd.a  ${LDIR}afs/libcom_err.a \
+THLIBS= ${LDIR}/afs/libcmd.a  ${LDIR}/afs/libcom_err.a \
        ${ULIBS} ${XLIBS} ${LIBRPC} -lpthread
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS}  ${XCFLAGS}
@@ -36,7 +36,7 @@ THFLAGS = -mt -DAFS_PTHREAD_ENV
 
 THRULE = ${CC} ${CFLAGS} ${THFLAGS} -c $?
 
-COMPILE_ET = ${SRCDIR}bin/compile_et
+COMPILE_ET = ${SRCDIR}/bin/compile_et
 
 noversion all test system: stress
 
@@ -58,7 +58,7 @@ th_stress.xdr.o: stress.xdr.c stress.h
        ${THRULE} -o th_stress.xdr.o
 
 stress.ss.c stress.cs.c stress.xdr.c stress.h: stress.rg
-       ${SRCDIR}bin/rxgen stress.rg
+       ${SRCDIR}/bin/rxgen stress.rg
 
 stress_errs.o: stress_errs.c
 
index 921f879..102f5f6 100644 (file)
@@ -12,21 +12,23 @@ SYS_NAME=@AFS_SYSNAME@
 
 SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
-include ../config/Makefile.version
 
 KERNELDIR = ../libafs/
 UKERNELDIR = ../libuafs/
-RXGEN=${SRCDIR}bin/rxgen
+RXGEN=${SRCDIR}/bin/rxgen
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 KSRCS=rxstat.c rxstat.h Krxstat.ss.c Krxstat.xdr.c
 
-CFLAGS = $(DBUG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS = -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 
 LIBOBJS = rxstat.cs.o rxstat.ss.o rxstat.xdr.o rxstat.o
 
-all: librxstat.a includes
+all: install
 
+#
+# Build targets
+#
 rxstat.cs.c rxstat.ss.c rxstat.xdr.c rxstat.h: rxstat.xg
        ${RXGEN} -x rxstat.xg
 
@@ -35,14 +37,6 @@ librxstat.a: ${LIBOBJS} AFS_component_version_number.o
        $(AR) rv $@ AFS_component_version_number.o ${LIBOBJS}
        $(RANLIB) $@
 
-kinstall: ${KSRCS} 
-       set ${KERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${KSRCS} ${KERNELDIR}afsint
-
-ukinstall webinstall:  ${KSRCS}
-       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${KSRCS} ${UKERNELDIR}afsint
-
 Krxstat.cs.c: rxstat.xg
        ${RXGEN} -x -k -C -o $@ rxstat.xg
 
@@ -52,11 +46,65 @@ Krxstat.ss.c: rxstat.xg
 Krxstat.xdr.c: rxstat.xg
        ${RXGEN} -x -k -c -o $@ rxstat.xg
 
-install: librxstat.a includes kinstall ukinstall
-       ${INSTALL} librxstat.a ${DESTDIR}lib
+#
+# Install targets
+#
+install: kinstall ukinstall \
+       ${DESTDIR}/include/rx/rxstat.h \
+       ${DESTDIR}/lib/librxstat.a 
+
+${DESTDIR}/lib/librxstat.a: librxstat.a
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/rx/rxstat.h: rxstat.h
+       ${INSTALL} $? $@
+
+kinstall: ${KERNELDIR}/afsint \
+       ${KERNELDIR}/afsint/rxstat.c \
+       ${KERNELDIR}/afsint/rxstat.h \
+       ${KERNELDIR}/afsint/Krxstat.ss.c \
+       ${KERNELDIR}/afsint/Krxstat.xdr.c 
+
+${KERNELDIR}/afsint:
+       mkdir -p $?
+
+${KERNELDIR}/afsint/rxstat.c: rxstat.c
+       ${INSTALL} $? $@
+
+${KERNELDIR}/afsint/rxstat.h: rxstat.h
+       ${INSTALL} $? $@
 
-includes: rxstat.h
-       ${INSTALL} rxstat.h ${DESTDIR}include/rx
+${KERNELDIR}/afsint/Krxstat.ss.c: Krxstat.ss.c
+       ${INSTALL} $? $@
 
+${KERNELDIR}/afsint/Krxstat.xdr.c: Krxstat.xdr.c
+       ${INSTALL} $? $@
+
+ukinstall: ${UKERNELDIR}/afsint \
+       ${UKERNELDIR}/afsint/rxstat.c \
+       ${UKERNELDIR}/afsint/rxstat.h \
+       ${UKERNELDIR}/afsint/Krxstat.ss.c \
+       ${UKERNELDIR}/afsint/Krxstat.xdr.c
+
+${UKERNELDIR}/afsint:
+       mkdir -p $?
+
+${UKERNELDIR}/afsint/rxstat.c: rxstat.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/rxstat.h: rxstat.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/Krxstat.ss.c: Krxstat.ss.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/Krxstat.xdr.c: Krxstat.xdr.c
+       ${INSTALL} $? $@
+
+#
+# Misc. targets
+#
 clean:
-       rm -f rxstat.h *.xdr.c *.cs.c *.ss.c *.o *.a core *_component_version_number.c
+       rm -f rxstat.h *.xdr.c *.cs.c *.ss.c *.o *.a core AFS_component_version_number.c
+
+include ../config/Makefile.version
index bcd14f5..ed2f293 100644 (file)
@@ -17,49 +17,49 @@ include ../config/Makefile.${SYS_NAME}
 
 CFLAGS= ${DBUG} -I. \
        -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include \
-       -I${SRCDIR}include/afs \
+       -I${SRCDIR}/include \
+       -I${SRCDIR}/include/afs \
        -I${SRCDIR} ${XCFLAGS}
 LDFLAGS = ${XLDFLAGS}
 
-#RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h bosint.h
+#RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h bosint.h
 RPCINCLS=
 
-INCLS=${SRCDIR}include/afs/gtxobjects.h \
-       ${SRCDIR}include/afs/gtxwindows.h \
-       ${SRCDIR}include/afs/gtxcurseswin.h \
-       ${SRCDIR}include/afs/gtxdumbwin.h \
-       ${SRCDIR}include/afs/gtxX11win.h \
-       ${SRCDIR}include/afs/gtxobjects.h \
-       ${SRCDIR}include/afs/gtxlightobj.h \
-       ${SRCDIR}include/afs/gtxtextobj.h \
-       ${SRCDIR}include/afs/gtxobjdict.h \
+INCLS=${SRCDIR}/include/afs/gtxobjects.h \
+       ${SRCDIR}/include/afs/gtxwindows.h \
+       ${SRCDIR}/include/afs/gtxcurseswin.h \
+       ${SRCDIR}/include/afs/gtxdumbwin.h \
+       ${SRCDIR}/include/afs/gtxX11win.h \
+       ${SRCDIR}/include/afs/gtxobjects.h \
+       ${SRCDIR}/include/afs/gtxlightobj.h \
+       ${SRCDIR}/include/afs/gtxtextobj.h \
+       ${SRCDIR}/include/afs/gtxobjdict.h \
        ${RPCINCLS} \
-       ${SRCDIR}include/afs/keys.h \
-       ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/afs/cmd.h
+       ${SRCDIR}/include/afs/keys.h \
+       ${SRCDIR}/include/afs/cellconfig.h \
+       ${SRCDIR}/include/afs/cmd.h
  
-LIBS=  ${SRCDIR}lib/afs/libgtx.a \
-       ${SRCDIR}lib/afs/libfsprobe.a \
-       ${SRCDIR}lib/afs/libvolser.a \
-       ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/vlib.a ${SRCDIR}/lib/afs/libacl.a \
-        ${SRCDIR}lib/afs/libvldb.a \
-        ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libafsint.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/libaudit.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/util.a
+LIBS=  ${SRCDIR}/lib/afs/libgtx.a \
+       ${SRCDIR}/lib/afs/libfsprobe.a \
+       ${SRCDIR}/lib/afs/libvolser.a \
+       ${SRCDIR}/lib/afs/libkauth.a \
+       ${SRCDIR}/lib/afs/libauth.a \
+       ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/libdes.a \
+       ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/afs/vlib.a ${SRCDIR}/lib/afs/libacl.a \
+        ${SRCDIR}/lib/afs/libvldb.a \
+        ${SRCDIR}/lib/libubik.a \
+       ${SRCDIR}/lib/afs/libafsint.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/afs/libaudit.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/util.a
 
-EXTRA_LIBS= ${TXLIBS} ${SRCDIR}lib/afs/libtermlib.a  ${XLIBS}
+EXTRA_LIBS= ${TXLIBS} ${SRCDIR}/lib/afs/libtermlib.a  ${XLIBS}
 
 include ../config/Makefile.version
 
@@ -76,7 +76,7 @@ scout: scout.o $(LIBS)
 system: install
 
 install: all
-       ${INSTALL} scout ${DESTDIR}bin
+       ${INSTALL} scout ${DESTDIR}/bin
 
 clean:
        rm -f  *.o scout core AFS_component_version_number.c
index 0e91ebe..d779596 100644 (file)
@@ -19,17 +19,17 @@ SHELL=/bin/sh
 #
 include ../config/Makefile.${SYS_NAME}
 OPTIMIZE=-g
-CFLAGS = ${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 LDFLAGS = ${OPTIMIZE} ${XLDFLAGS}
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
-KAFSLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.krb.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a
+LIBDIR = ${DESTDIR}/lib/
+AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \
+         ${LIBDIR}/afs/libauth.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \
+         ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \
+          ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a
+KAFSLIBS = ${LIBDIR}/afs/libkauth.krb.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \
+         ${LIBDIR}/afs/libauth.krb.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \
+         ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \
+          ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a
 AUTHFILES=../inetd/ta-rauth.o ../rsh/rcmd.o ../rsh/herror.o
 AUTHLIBS=afsauthlib.so afskauthlib.so
 TARGETS=$(AUTHLIBS) 
index b9f9da0..3c4a7be 100644 (file)
@@ -19,9 +19,9 @@ include ../config/Makefile.${SYS_NAME}
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 UKERNELDIR=../libuafs/
-CFLAGS= ${DBUG}  -I${TOP_SRCDIR}/config -I${SRCDIR}include  ${XCFLAGS}
-SFLAGS=-P -I${SRCDIR}include  
-LIBS= libsys.a ${SRCDIR}lib/librx.a libsys.a ${SRCDIR}lib/liblwp.a ${SRCDIR}lib/afs/util.a ${XLIBS}
+CFLAGS= ${DBUG}  -I${TOP_SRCDIR}/config -I${SRCDIR}/include  ${XCFLAGS}
+SFLAGS=-P -I${SRCDIR}/include  
+LIBS= libsys.a ${SRCDIR}/lib/librx.a libsys.a ${SRCDIR}/lib/liblwp.a ${SRCDIR}/lib/afs/util.a ${XLIBS}
 UKSRCS=afsl.exp
 
 OBJECTS= afssyscalls.o syscall.o
@@ -29,20 +29,20 @@ RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o
 
 include ../config/Makefile.version
 
-all: libsys.a ${DESTDIR}etc/rmtsysd  ${DESTDIR}include/afs/afssyscalls.h \
-       ${DESTDIR}bin/pagsh  ${DESTDIR}bin/pagsh.krb
+all: libsys.a ${DESTDIR}/etc/rmtsysd  ${DESTDIR}/include/afs/afssyscalls.h \
+       ${DESTDIR}/bin/pagsh  ${DESTDIR}/bin/pagsh.krb
 
-${DESTDIR}etc/rmtsysd: rmtsysd
-       ${INSTALL} -s rmtsysd ${DESTDIR}etc/rmtsysd
+${DESTDIR}/etc/rmtsysd: rmtsysd
+       ${INSTALL} -s rmtsysd ${DESTDIR}/etc/rmtsysd
 
-${DESTDIR}bin/pagsh: pagsh
-       ${INSTALL} -s pagsh ${DESTDIR}bin/pagsh
+${DESTDIR}/bin/pagsh: pagsh
+       ${INSTALL} -s pagsh ${DESTDIR}/bin/pagsh
 
-${DESTDIR}bin/pagsh.krb: pagsh.krb
-       ${INSTALL} -s pagsh.krb ${DESTDIR}bin/pagsh.krb
+${DESTDIR}/bin/pagsh.krb: pagsh.krb
+       ${INSTALL} -s pagsh.krb ${DESTDIR}/bin/pagsh.krb
 
-${DESTDIR}include/afs/afssyscalls.h: afssyscalls.h
-       ${INSTALL} afssyscalls.h ${DESTDIR}include/afs/afssyscalls.h
+${DESTDIR}/include/afs/afssyscalls.h: afssyscalls.h
+       ${INSTALL} afssyscalls.h ${DESTDIR}/include/afs/afssyscalls.h
 
 libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
        -rm -f libsys.a
@@ -58,7 +58,7 @@ system: install
 kinstall:
        case "${SYS_NAME}" in                           \
            rs_aix*)                    \
-               ${INSTALL} afs.exp ${DESTDIR}lib/afs;;  \
+               ${INSTALL} afs.exp ${DESTDIR}/lib/afs;; \
            sgi_6? ) \
                ${INSTALL} xfsattrs.h ../libafs/afs;; \
            *)                                          \
@@ -66,15 +66,15 @@ kinstall:
        esac
 
 install: all kinstall ukinstall
-       ${INSTALL} libsys.a ${DESTDIR}lib/afs
+       ${INSTALL} libsys.a ${DESTDIR}/lib/afs
        case "${SYS_NAME}" in \
        sgi_6? ) \
-               ${INSTALL} xfsattrs.h ${DESTDIR}include/afs;; \
+               ${INSTALL} xfsattrs.h ${DESTDIR}/include/afs;; \
        esac
 
 ukinstall webinstall: ${UKSRCS}
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
+       set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED)
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs
 
 tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd
 
@@ -108,7 +108,7 @@ 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
-       ${SRCDIR}bin/rxgen rmtsys.xg
+       ${SRCDIR}/bin/rxgen rmtsys.xg
 
 rmtsysd: rmtsysd.o libsys.a
        ${CC} ${CFLAGS} -o rmtsysd rmtsysd.o ${LIBS}
@@ -129,49 +129,49 @@ iinc:     iinc.c
            sgi_6*) \
                $(CC) -o iinc ${CFLAGS} iinc.c libsys.a;; \
            *)                                          \
-               $(CC) -o iinc -I${SRCDIR}include iinc.c ${LIBS} ${XLIBS};; \
+               $(CC) -o iinc -I${SRCDIR}/include iinc.c ${LIBS} ${XLIBS};; \
        esac
 idec:  idec.c  AFS_component_version_number.c
        case "${SYS_NAME}" in                           \
            sgi_6* ) \
                $(CC) -o idec ${CFLAGS} idec.c libsys.a;; \
            *)                                          \
-               $(CC) -o idec -I${SRCDIR}include idec.c ${LIBS} ${XLIBS};; \
+               $(CC) -o idec -I${SRCDIR}/include idec.c ${LIBS} ${XLIBS};; \
        esac
 icreate:icreate.c  AFS_component_version_number.c
        case "${SYS_NAME}" in                           \
            sgi_6* ) \
                $(CC) -o icreate ${CFLAGS} icreate.c libsys.a;; \
            *)                                          \
-               $(CC) -o icreate -I${SRCDIR}include icreate.c ${XLIBS};; \
+               $(CC) -o icreate -I${SRCDIR}/include icreate.c ${XLIBS};; \
        esac
 iopen: iopen.c  AFS_component_version_number.c
        case "${SYS_NAME}" in                           \
            sgi_6* ) \
                $(CC) -o iopen ${CFLAGS} iopen.c libsys.a;; \
            *)                                          \
-               $(CC) -o iopen -I${SRCDIR}include iopen.c ${XLIBS};; \
+               $(CC) -o iopen -I${SRCDIR}/include iopen.c ${XLIBS};; \
        esac
 iread: iread.c  AFS_component_version_number.c
        case "${SYS_NAME}" in                           \
            sgi_6* ) \
                ${CC} -o iread ${CFLAGS} iread.c libsys.a;; \
            *)                                          \
-               ${CC} -o iread -I${SRCDIR}include iread.c ${XLIBS};; \
+               ${CC} -o iread -I${SRCDIR}/include iread.c ${XLIBS};; \
        esac
 iwrite:        iwrite.c  AFS_component_version_number.c
        case "${SYS_NAME}" in                           \
            sgi_6* ) \
                ${CC} -o iwrite ${CFLAGS} iwrite.c libsys.a;; \
            *)                                          \
-               ${CC} -o iwrite -I${SRCDIR}include iwrite.c ${XLIBS};; \
+               ${CC} -o iwrite -I${SRCDIR}/include iwrite.c ${XLIBS};; \
        esac
 istat: istat.c  AFS_component_version_number.c
        case "${SYS_NAME}" in                           \
                sgi_6* ) \
                $(CC) -o istat ${CFLAGS} istat.c libsys.a;; \
            *)                                          \
-               $(CC) -o istat -I${SRCDIR}include istat.c ${XLIBS};; \
+               $(CC) -o istat -I${SRCDIR}/include istat.c ${XLIBS};; \
        esac
 fixit: fixit.c AFS_component_version_number.c
        $(CC) -o fixit -IDEST/include fixit.c libsys.a 
@@ -189,6 +189,3 @@ clean:
        rm -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \
        rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \
        rmtsysd AFS_component_version_number.c pagsh pagsh.krb
-
-beancount:
-       wc -l *.c *.s
index 995f791..109f8d1 100644 (file)
@@ -53,38 +53,38 @@ LWPOBJS    =lock.o
 
 BUTMOBJS   =file_tm.o
 BUTMLIBS   =libbutm.a
-BUTMINCLS  =${SRCDIR}include/afs/com_err.h ${SRCDIR}include/afs/butm.h
-BUTMINCLUDE=-I${SRCDIR}include
+BUTMINCLS  =${SRCDIR}/include/afs/com_err.h ${SRCDIR}/include/afs/butm.h
+BUTMINCLUDE=-I${SRCDIR}/include
 
 BUTCOBJS   =dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o \
            tcudbprocs.o dump.o tcstatus.o butc_xbsa.o \
             ${LWPOBJS} ${BUCOORDOBJS}
-BUTCINCLS  =${SRCDIR}include/afs/partition.h \
-           ${SRCDIR}include/afs/volume.h \
-           ${SRCDIR}include/afs/vlserver.h \
-           ${SRCDIR}include/rx/rx.h \
-           ${SRCDIR}include/rx/xdr.h \
-           ${SRCDIR}include/afs/keys.h \
-           ${SRCDIR}include/afs/cellconfig.h \
-           ${SRCDIR}include/ubik.h \
-           ${SRCDIR}include/afs/cmd.h \
-           ${SRCDIR}include/afs/butc.h \
-           ${SRCDIR}include/afs/tcdata.h \
-           ${SRCDIR}include/afs/bubasics.h \
-           ${SRCDIR}include/afs/butm.h
-BUTCINCLUDE=-I. -I${SRCDIR}include
-BUTCLIBS   =${SRCDIR}lib/afs/libbudb.a \
-           ${SRCDIR}lib/afs/libbubasics.a \
+BUTCINCLS  =${SRCDIR}/include/afs/partition.h \
+           ${SRCDIR}/include/afs/volume.h \
+           ${SRCDIR}/include/afs/vlserver.h \
+           ${SRCDIR}/include/rx/rx.h \
+           ${SRCDIR}/include/rx/xdr.h \
+           ${SRCDIR}/include/afs/keys.h \
+           ${SRCDIR}/include/afs/cellconfig.h \
+           ${SRCDIR}/include/ubik.h \
+           ${SRCDIR}/include/afs/cmd.h \
+           ${SRCDIR}/include/afs/butc.h \
+           ${SRCDIR}/include/afs/tcdata.h \
+           ${SRCDIR}/include/afs/bubasics.h \
+           ${SRCDIR}/include/afs/butm.h
+BUTCINCLUDE=-I. -I${SRCDIR}/include
+BUTCLIBS   =${SRCDIR}/lib/afs/libbudb.a \
+           ${SRCDIR}/lib/afs/libbubasics.a \
            ${VOLSERLIBS} \
             ${BUTMLIBS} \
-           ${SRCDIR}lib/afs/libvldb.a \
+           ${SRCDIR}/lib/afs/libvldb.a \
            ${SRCDIR}/lib/libafsauthent.a \
            ${SRCDIR}/lib/libafsrpc.a \
-            ${SRCDIR}lib/afs/libcmd.a \
-           ${SRCDIR}lib/afs/util.a \
-           ${SRCDIR}lib/afs/libusd.a \
-           ${SRCDIR}lib/afs/libprocmgmt.a \
-           ${SRCDIR}lib/librx.a
+            ${SRCDIR}/lib/afs/libcmd.a \
+           ${SRCDIR}/lib/afs/util.a \
+           ${SRCDIR}/lib/afs/libusd.a \
+           ${SRCDIR}/lib/afs/libprocmgmt.a \
+           ${SRCDIR}/lib/librx.a
 
 include ../config/Makefile.version
 
@@ -290,7 +290,7 @@ pre:
 
 all: butc ${BUTMLIBS}
 install install.noversion: all
-       ${INSTALL} butc ${DESTDIR}etc/butc
+       ${INSTALL} butc ${DESTDIR}/etc/butc
 
 noversion: install
 system: install
index 750bead..805355e 100644 (file)
@@ -12,16 +12,16 @@ SYS_NAME=@AFS_SYSNAME@
 
 include ../config/Makefile.${SYS_NAME}
 OPTIMIZE=-g
-CFLAGS = ${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-LIBDIR = ${DESTDIR}lib/
-AFSLIBS = ${LIBDIR}afs/libkauth.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a ${LIBDIR}afs/libaudit.a
-KAFSLIBS = ${LIBDIR}afs/libkauth.krb.a ${LIBDIR}afs/libprot.a ${LIBDIR}libubik.a \
-         ${LIBDIR}afs/libauth.krb.a ${DESTDIR}lib/librxkad.a ${LIBDIR}afs/libsys.a \
-         ${DESTDIR}lib/libdes.a ${LIBDIR}librx.a ${LIBDIR}liblwp.a \
-          ${LIBDIR}afs/libcmd.a ${LIBDIR}afs/libcom_err.a ${LIBDIR}afs/util.a ${LIBDIR}afs/libaudit.a
+CFLAGS = ${OPTIMIZE} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
+LIBDIR = ${DESTDIR}/lib/
+AFSLIBS = ${LIBDIR}/afs/libkauth.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \
+         ${LIBDIR}/afs/libauth.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \
+         ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \
+          ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a ${LIBDIR}/afs/libaudit.a
+KAFSLIBS = ${LIBDIR}/afs/libkauth.krb.a ${LIBDIR}/afs/libprot.a ${LIBDIR}/libubik.a \
+         ${LIBDIR}/afs/libauth.krb.a ${DESTDIR}/lib/librxkad.a ${LIBDIR}/afs/libsys.a \
+         ${DESTDIR}/lib/libdes.a ${LIBDIR}/librx.a ${LIBDIR}/liblwp.a \
+          ${LIBDIR}/afs/libcmd.a ${LIBDIR}/afs/libcom_err.a ${LIBDIR}/afs/util.a ${LIBDIR}/afs/libaudit.a
 AUTHLIBS=afs_dynamic_auth afs_dynamic_kerbauth
 IMPORTS = -bI:/lib/aio.exp -bI:/lib/netinet.exp -bI:/lib/sockets.exp -bI:/lib/statcmd.exp 
 LDFLAGS = -eafs_initialize ${IMPORTS}  -lsys -lcsys -lc
index e7fd31b..48aebd4 100644 (file)
@@ -36,8 +36,7 @@ LWPOBJS=lock.o fasttime.o threadname.o
 
 LIBACLOBJS=aclprocs.o netprocs.o
 
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
-               volparse.o flipbase64.o
+UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o
 
 DIROBJS=buffer.o dir.o salvage.o
 
@@ -49,165 +48,147 @@ FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
 objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
         ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
 
-LIBS=  ${SRCDIR}lib/libafsauthent.a    \
-       ${SRCDIR}lib/libafsrpc.a \
-       ${SRCDIR}lib/afs/util.a
+LIBS= ${SRCDIR}/lib/libafsauthent.a ${SRCDIR}/lib/libafsrpc.a ${SRCDIR}/lib/afs/util.a
 
-include ../config/Makefile.version
-
-noversion: install
+all: install
 
-all: fileserver
-
-CRULE1=${CC} ${CFLAGS} -c $?
+COMPILE=${CC} ${CFLAGS} -c $?
 
 viced.o: ${VICED}/viced.c
-       ${CRULE1}
+       ${COMPILE}
 
 afsfileprocs.o: ${VICED}/afsfileprocs.c
-       ${CRULE1}
+       ${COMPILE}
 
 host.o: ${VICED}/host.c
-       ${CRULE1}
+       ${COMPILE}
 
 physio.o: ${VICED}/physio.c
-       ${CRULE1}
+       ${COMPILE}
 
 callback.o: ${VICED}/callback.c
-       ${CRULE1}
+       ${COMPILE}
 
 assert.o: ${UTIL}/assert.c
-       ${CRULE1};
+       ${COMPILE}
 
 uuid.o: ${UTIL}/uuid.c
-       ${CRULE1};
+       ${COMPILE}
 
 serverLog.o: ${UTIL}/serverLog.c
-       ${CRULE1};
+       ${COMPILE}
 
 fileutil.o: ${UTIL}/fileutil.c
-       ${CRULE1};
+       ${COMPILE}
 
 volparse.o: ${UTIL}/volparse.c
-       ${CRULE1};
+       ${COMPILE}
 
 flipbase64.o: ${UTIL}/flipbase64.c
-       ${CRULE1};
+       ${COMPILE}
 
 netutils.o: ${UTIL}/netutils.c
-       ${CRULE1};
+       ${COMPILE}
 
 dirpath.o: ${UTIL}/dirpath.c
-       ${CRULE1};
+       ${COMPILE}
 
 lock.o: ${LWP}/lock.c
-       ${CRULE1};
+       ${COMPILE}
 
 fasttime.o: ${LWP}/fasttime.c
-       ${CRULE1};
+       ${COMPILE}
 
 threadname.o: ${LWP}/threadname.c
-       ${CRULE1};
+       ${COMPILE}
 
 aclprocs.o: ${LIBACL}/aclprocs.c
-       ${CRULE1}
+       ${COMPILE}
 
 netprocs.o: ${LIBACL}/netprocs.c
-       ${CRULE1}
+       ${COMPILE}
 
 vldbint.cs.o: ${VLSERVER}/vldbint.cs.c
-       ${CRULE1}
+       ${COMPILE}
 
 vldbint.xdr.o: ${VLSERVER}/vldbint.xdr.c
-       ${CRULE1}
+       ${COMPILE}
 
 buffer.o: ${DIR}/buffer.c
-       ${CRULE1}
+       ${COMPILE}
 
 dir.o: ${DIR}/dir.c
-       ${CRULE1}
+       ${COMPILE}
 
 salvage.o: ${DIR}/salvage.c
-       ${CRULE1}
+       ${COMPILE}
 
 vnode.o: ${VOL}/vnode.c
-       ${CC} -c ${CFLAGS} ${VOL}/vnode.c
+       ${COMPILE}
 
 volume.o: ${VOL}/volume.c
-       ${CC} -c ${CFLAGS} ${VOL}/volume.c
+       ${COMPILE}
 
 vutil.o: ${VOL}/vutil.c
-       ${CC} -c ${CFLAGS} ${VOL}/vutil.c
+       ${COMPILE}
 
 partition.o: ${VOL}/partition.c
-       ${CC} -c ${CFLAGS} ${VOL}/partition.c
+       ${COMPILE}
 
 fssync.o: ${VOL}/fssync.c
-       ${CC} -c ${CFLAGS} ${VOL}/fssync.c
+       ${COMPILE}
 
 purge.o: ${VOL}/purge.c
-       ${CC} -c ${CFLAGS} ${VOL}/purge.c
+       ${COMPILE}
 
 clone.o: ${VOL}/clone.c
-       ${CC} -c ${CFLAGS} ${VOL}/clone.c
+       ${COMPILE}
 
 nuke.o: ${VOL}/nuke.c
-       ${CC} -c ${CFLAGS} ${VOL}/nuke.c
+       ${COMPILE}
 
 devname.o: ${VOL}/devname.c
-       ${CC} -c ${CFLAGS} ${VOL}/devname.c
+       ${COMPILE}
 
 common.o: ${VOL}/common.c
-       ${CC} -c ${CFLAGS} ${VOL}/common.c
+       ${COMPILE}
 
 listinodes.o: ${VOL}/listinodes.c
-       ${CC} -c ${CFLAGS} ${VOL}/listinodes.c
+       ${COMPILE}
 
 ihandle.o: ${VOL}/ihandle.c
-       ${CC} -c ${CFLAGS} ${VOL}/ihandle.c
+       ${COMPILE}
 
 namei_ops.o: ${VOL}/namei_ops.c
-       ${CC} -c ${CFLAGS} ${VOL}/namei_ops.c
+       ${COMPILE}
 
 afsaux.o: ${FSINT}/afsaux.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afsaux.c
+       ${COMPILE}
 
 afscbint.cs.o: ${FSINT}/afscbint.cs.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afscbint.cs.c
+       ${COMPILE}
 
 afscbint.ss.o: ${FSINT}/afscbint.ss.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afscbint.ss.c
+       ${COMPILE}
 
 afsint.cs.o: ${FSINT}/afsint.cs.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afsint.cs.c
+       ${COMPILE}
 
 afsint.ss.o: ${FSINT}/afsint.ss.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afsint.ss.c
+       ${COMPILE}
 
 afsint.xdr.o: ${FSINT}/afsint.xdr.c
-       ${CC} -c ${CFLAGS} ${FSINT}/afsint.xdr.c
+       ${COMPILE}
 
-fileserver: callback_clean1 viced.o ${objects} ${LIBS}
+fileserver: ${objects} ${LIBS}
        ${CC} ${LDFLAGS} -o fileserver ${objects} ${LIBS} ${MTLIBS} ${XLIBS}
 
-${DESTDIR}root.server/usr/afs/bin/fileserver : fileserver
-       ${INSTALL} -ns fileserver ${DESTDIR}root.server/usr/afs/bin/fileserver
-
-install: all  ${DESTDIR}root.server/usr/afs/bin/fileserver
+${DESTDIR}/root.server/usr/afs/bin/fileserver: fileserver
+       ${INSTALL} -ns $? $@
 
-system: install
-
-callback_clean1 callback_clean2: 
-       case ${SYS_NAME} in \
-       ncrx86_*) \
-               ${RM}  -f callback.o;\
-               echo ${RM} callback.o;;\
-       esac;
-
-lint:
+install: ${DESTDIR}/root.server/usr/afs/bin/fileserver
 
 clean:
        rm -f *.o fileserver core AFS_component_version_number.c
 
-beancount:
-       wc -l *.c *.h
+include ../config/Makefile.version
index 49fd405..09e9e4f 100644 (file)
@@ -15,19 +15,19 @@ SHELL = /bin/sh
 include ../config/Makefile.${SYS_NAME}
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
-CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I./ -I${SRCDIR}include ${XCFLAGS}
+CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I./ -I${SRCDIR}/include ${XCFLAGS}
 UKERNELDIR=../libuafs/
 LIBOBJS=disk.o  remote.o beacon.o recovery.o ubik.o  vote.o lock.o phys.o \
        ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \
        ubikclient.o uerrors.o
-INCLS= ${SRCDIR}include/lwp.h ${SRCDIR}include/lock.h \
-       ${SRCDIR}include/rx/rx.h ${SRCDIR}include/rx/xdr.h \
-       ${SRCDIR}include/lock.h ubik.h ubik_int.h
-LIBS=${SRCDIR}lib/librx.a ${SRCDIR}lib/liblwp.a \
-     ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/libcmd.a \
-     ${SRCDIR}lib/afs/util.a ${SRCDIR}lib/afs/libsys.a ${XLIBS}
-RXGEN=${SRCDIR}bin/rxgen
-COMPILE_ET = ${SRCDIR}bin/compile_et
+INCLS= ${SRCDIR}/include/lwp.h ${SRCDIR}/include/lock.h \
+       ${SRCDIR}/include/rx/rx.h ${SRCDIR}/include/rx/xdr.h \
+       ${SRCDIR}/include/lock.h ubik.h ubik_int.h
+LIBS=${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a \
+     ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/libcmd.a \
+     ${SRCDIR}/lib/afs/util.a ${SRCDIR}/lib/afs/libsys.a ${XLIBS}
+RXGEN=${SRCDIR}/bin/rxgen
+COMPILE_ET = ${SRCDIR}/bin/compile_et
 
 UKSRCS=ubik.h ubikclient.c uerrors.c
 
@@ -36,7 +36,7 @@ include ../config/Makefile.version
 all: libubik.a test
 
 test: utst_server utst_client udebug
-       ${INSTALL} udebug ${DESTDIR}bin
+       ${INSTALL} udebug ${DESTDIR}/bin
        ${INSTALL} udebug ${DESTDIR}root.server/usr/afs/bin
 
 clean:
@@ -49,19 +49,16 @@ kinstall:
        @echo No $@ source here.
 
 ukinstall webinstall: ${UKSRCS} Kubik_int.h Kubik_int.xdr.c Kubik_int.cs.c
-       set ${UKERNELDIR}afs; $(MKDIR_IF_NEEDED)
-       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} Kubik_int.h ${UKERNELDIR}afsint/ubik_int.h
-       ${INSTALL} Kubik_int.cs.c ${UKERNELDIR}afsint/ubik_int.cs.c
-       ${INSTALL} Kubik_int.xdr.c ${UKERNELDIR}afsint/ubik_int.xdr.c
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}afs
-
-beancount:
-       wc *.[ch] *.xg
+       set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED)
+       set ${UKERNELDIR}/afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} Kubik_int.h ${UKERNELDIR}/afsint/ubik_int.h
+       ${INSTALL} Kubik_int.cs.c ${UKERNELDIR}/afsint/ubik_int.cs.c
+       ${INSTALL} Kubik_int.xdr.c ${UKERNELDIR}/afsint/ubik_int.xdr.c
+       ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs
 
 install: libubik.a ukinstall
-       ${INSTALL} libubik.a ${DESTDIR}lib
-       ${INSTALL} ubik.h ubik_int.h ${DESTDIR}include
+       ${INSTALL} libubik.a ${DESTDIR}/lib
+       ${INSTALL} ubik.h ubik_int.h ${DESTDIR}/include
 
 utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a 
        ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS)
index 3f18202..4ff7bef 100644 (file)
@@ -14,12 +14,12 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-LIBRX=${SRCDIR}lib/librx.a
-LIBS = ${SRCDIR}lib/afs/libauth.a ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/libdes.a ${LIBRX} ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libcom_err.a ${SRCDIR}lib/afs/util.a \
-       ${SRCDIR}lib/afs/libsys.a 
-CFLAGS= ${DBUG}  -I${SRCDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
+LIBRX=${SRCDIR}/lib/librx.a
+LIBS = ${SRCDIR}/lib/afs/libauth.a ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/libdes.a ${LIBRX} ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/util.a \
+       ${SRCDIR}/lib/afs/libsys.a 
+CFLAGS= ${DBUG}  -I${SRCDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS}
 
 PROGS=upclient upserver
 
@@ -38,7 +38,7 @@ 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
-       ${SRCDIR}bin/rxgen update.xg
+       ${SRCDIR}/bin/rxgen update.xg
 clean: 
        rm -f upclient upserver *.o update.ss.c update.cs.c update.xdr.c update.h core\
        AFS_component_version_number.c
index e7aadd2..191700b 100644 (file)
@@ -14,14 +14,14 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-RXGEN=${SRCDIR}bin/rxgen
-COMPILE_ET = ${SRCDIR}bin/compile_et
+RXGEN=${SRCDIR}/bin/rxgen
+COMPILE_ET = ${SRCDIR}/bin/compile_et
 
-CFLAGS = $(DBG) -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS = $(DBG) -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 
 #####################################################################
 # include files
-INCLS=${SRCDIR}include/afs/param.h \
+INCLS=${SRCDIR}/include/afs/param.h \
        usd.h
 
 LINCLS=usd.h
@@ -51,9 +51,9 @@ kinstall:
        @echo No kernel source here.
 
 
-${DESTDIR}lib/afs/libusd.a: libusd.a
+${DESTDIR}/lib/afs/libusd.a: libusd.a
        ${INSTALL}   $? $@
 
 
-install: ${DESTDIR}lib/afs/libusd.a 
-       ${INSTALL} usd.h ${DESTDIR}include/afs
+install: ${DESTDIR}/lib/afs/libusd.a 
+       ${INSTALL} usd.h ${DESTDIR}/include/afs
index 8d4f9b8..0004332 100644 (file)
@@ -24,25 +24,25 @@ PROGRAMS = uss
 #
 # and here's what it uses to do so:
 #
-LIBS = ${SRCDIR}lib/afs/libvolser.a \
-       ${SRCDIR}lib/afs/libvldb.a  \
-       ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libprot.a \
-       ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/afs/libcom_err.a\
-       ${SRCDIR}lib/afs/util.a \
+LIBS = ${SRCDIR}/lib/afs/libvolser.a \
+       ${SRCDIR}/lib/afs/libvldb.a  \
+       ${SRCDIR}/lib/afs/libkauth.a \
+       ${SRCDIR}/lib/afs/libprot.a \
+       ${SRCDIR}/lib/libubik.a \
+       ${SRCDIR}/lib/afs/libauth.a \
+       ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/libdes.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/afs/libcom_err.a\
+       ${SRCDIR}/lib/afs/util.a \
        ${XLIBS}
 
 CFLAGS = ${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include -I. ${XCFLAGS}
+       -I${SRCDIR}/include -I. ${XCFLAGS}
 OBJS =  uss_procs.o \
        uss_common.o \
        uss_vol.o \
@@ -61,7 +61,7 @@ include ../config/Makefile.version
 all :  ${PROGRAMS}
 
 install: all
-       ${INSTALL} uss ${DESTDIR}etc
+       ${INSTALL} uss ${DESTDIR}/etc
 
 system: install
 
index 780dace..66058b3 100644 (file)
@@ -22,62 +22,7 @@ objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
         dirpath.o fileutil.o netutils.o flipbase64.o \
         afs_atomlist.o afs_lhash.o snprintf.o ${REGEX_OBJ}
 
-headers = assert.h potpourri.h itc.h errors.h afsutil.h pthread_glock.h \
-         dirpath.h afs_atomlist.h afs_lhash.h
-
-include ../config/Makefile.version
-
-system noversion: install
-
-all:   util.a sys
-
-${DESTDIR}bin/sys: sys
-       ${INSTALL} sys ${DESTDIR}bin/sys
-
-install0: ${DESTDIR}include/afs/dirpath.h \
-       ${DESTDIR}include/afs/pthread_nosigs.h \
-       ${objects} util.a ${DESTDIR}bin/sys ${someheaders} doc 
-       ${INSTALL} util.a ${DESTDIR}lib/afs
-       ${INSTALL} util.a ${DESTDIR}lib/afs/libafsutil.a
-       ${INSTALL} assert.h errors.h vice.h remote.h ktime.h fileutil.h \
-               netutils.h packages.h afsutil.h pthread_glock.h \
-               afs_atomlist.h afs_lhash.h \
-               ${DESTDIR}include/afs
-       ${INSTALL} potpourri.h ${DESTDIR}include
-
-install: install0 kinstall ukinstall
-
-install_headers:
-       ${INSTALL} assert.h errors.h vice.h remote.h ktime.h fileutil.h \
-               netutils.h packages.h afsutil.h pthread_glock.h \
-               afs_atomlist.h afs_lhash.h \
-               ${DESTDIR}include/afs
-
-kinstall:
-       ${INSTALL} vice.h ../libafs/afs
-       ${INSTALL} base64.c ../libafs/afs/afs_base64.c
-       ${INSTALL} uuid.c ../libafs/afs/afs_uuid.c
-       ${INSTALL} afs_atomlist.c ../libafs/afs
-       ${INSTALL} afs_atomlist.h ../libafs/afs
-       ${INSTALL} afs_lhash.c ../libafs/afs
-       ${INSTALL} afs_lhash.h ../libafs/afs
-
-ukinstall webinstall: install0
-       ${INSTALL} pthread_glock.h vice.h errors.h afsutil.h dirpath.h fileutil.h netutils.h casestrcpy.c dirpath.c hostparse.c fileutil.c netutils.c ../libuafs/afs
-       ${INSTALL} uuid.c ../libuafs/afs/afs_uuid.c
-       ${INSTALL} afs_atomlist.c ../libuafs/afs
-       ${INSTALL} afs_atomlist.h ../libuafs/afs
-       ${INSTALL} afs_lhash.c ../libuafs/afs
-       ${INSTALL} afs_lhash.h ../libuafs/afs
-
-${DESTDIR}include/afs/dirpath.h: dirpath.h
-       ${INSTALL} dirpath.h  ${DESTDIR}include/afs
-
-${DESTDIR}include/afs/pthread_nosigs.h: pthread_nosigs.h
-       ${INSTALL} pthread_nosigs.h  ${DESTDIR}include/afs
-
-doc:
-       echo no documents in this directory
+all: install
 
 util.a: ${objects} AFS_component_version_number.o
        rm -f util.a
@@ -135,13 +80,196 @@ afs_atomlist.o: afs_atomlist.c afs_atomlist.h
 afs_lhash.o: afs_lhash.c afs_lhash.h afs_atomlist.h
        ${CC} ${CFLAGS} -c afs_lhash.c
 
+#
+# Install targets
+#
+KDIR=../libafs/afs
+UKDIR=../libuafs/afs
+INCDIR=${DESTDIR}/include
+LIBDIR=${DESTDIR}/lib/afs
+
+install: ukinstall kinstall \
+       ${INCDIR}/afs/dirpath.h \
+       ${INCDIR}/afs/pthread_nosigs.h \
+       ${INCDIR}/afs/assert.h \
+       ${INCDIR}/afs/errors.h \
+       ${INCDIR}/afs/vice.h \
+       ${INCDIR}/afs/remote.h \
+       ${INCDIR}/afs/ktime.h \
+       ${INCDIR}/afs/fileutil.h \
+       ${INCDIR}/afs/netutils.h \
+       ${INCDIR}/afs/packages.h \
+       ${INCDIR}/afs/afsutil.h \
+       ${INCDIR}/afs/pthread_glock.h \
+       ${INCDIR}/afs/afs_atomlist.h \
+       ${INCDIR}/afs/afs_lhash.h \
+       ${INCDIR}/potpourri.h \
+       ${LIBDIR}/util.a \
+       ${LIBDIR}/libafsutil.a \
+       ${DESTDIR}/bin/sys 
+
+${INCDIR}/afs/dirpath.h: dirpath.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/pthread_nosigs.h: pthread_nosigs.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/assert.h: assert.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/errors.h: errors.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/vice.h: vice.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/remote.h: remote.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/ktime.h: ktime.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/fileutil.h: fileutil.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/netutils.h: netutils.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/packages.h: packages.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/afsutil.h: afsutil.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/pthread_glock.h: pthread_glock.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/afs_atomlist.h: afs_atomlist.h
+       ${INSTALL} $? $@
+
+${INCDIR}/afs/afs_lhash.h: afs_lhash.h
+       ${INSTALL} $? $@
+
+${INCDIR}/potpourri.h: potpourri.h
+       ${INSTALL} $? $@
+
+${LIBDIR}/util.a: util.a
+       ${INSTALL} $? $@
+
+${LIBDIR}/libafsutil.a: util.a
+       ${INSTALL} $? $@
+
+${DESTDIR}/bin/sys: sys
+       ${INSTALL} $? $@
+
+kinstall: ${KDIR}/vice.h \
+       ${KDIR}/afs_base64.c \
+       ${KDIR}/afs_uuid.c \
+       ${KDIR}/afs_atomlist.c \
+       ${KDIR}/afs_atomlist.h \
+       ${KDIR}/afs_lhash.c \
+       ${KDIR}/afs_lhash.h
+
+${KDIR}/vice.h: vice.h
+       ${INSTALL} $? $@
+
+${KDIR}/afs_base64.c: base64.c
+       ${INSTALL} $? $@
+
+${KDIR}/afs_uuid.c: uuid.c
+       ${INSTALL} $? $@
+
+${KDIR}/afs_atomlist.c: afs_atomlist.c
+       ${INSTALL} $? $@
+
+${KDIR}/afs_atomlist.h: afs_atomlist.h
+       ${INSTALL} $? $@
+
+${KDIR}/afs_lhash.c: afs_lhash.c
+       ${INSTALL} $? $@
+
+${KDIR}/afs_lhash.h: afs_lhash.h
+       ${INSTALL} $? $@
+
+ukinstall: \
+       ${UKDIR}/afs_uuid.c \
+       ${UKDIR}/afs_atomlist.c \
+       ${UKDIR}/afs_atomlist.h \
+       ${UKDIR}/afs_lhash.c \
+       ${UKDIR}/afs_lhash.h \
+       ${UKDIR}/pthread_glock.h \
+       ${UKDIR}/vice.h \
+       ${UKDIR}/errors.h \
+       ${UKDIR}/afsutil.h \
+       ${UKDIR}/dirpath.h \
+       ${UKDIR}/dirpath.c \
+       ${UKDIR}/fileutil.h \
+       ${UKDIR}/fileutil.c \
+       ${UKDIR}/netutils.h \
+       ${UKDIR}/netutils.c \
+       ${UKDIR}/casestrcpy.c \
+       ${UKDIR}/hostparse.c 
+
+${UKDIR}/errors.h: errors.h
+       ${INSTALL} $? $@
+
+${UKDIR}/afsutil.h: afsutil.h
+       ${INSTALL} $? $@
+
+${UKDIR}/dirpath.h: dirpath.h
+       ${INSTALL} $? $@
+
+${UKDIR}/dirpath.c: dirpath.c
+       ${INSTALL} $? $@
+
+${UKDIR}/fileutil.h: fileutil.h
+       ${INSTALL} $? $@
+
+${UKDIR}/fileutil.c: fileutil.c
+       ${INSTALL} $? $@
+
+${UKDIR}/netutils.h: netutils.h
+       ${INSTALL} $? $@
+
+${UKDIR}/netutils.c: netutils.c
+       ${INSTALL} $? $@
+
+${UKDIR}/casestrcpy.c: casestrcpy.c
+       ${INSTALL} $? $@
+
+${UKDIR}/hostparse.c: hostparse.c
+       ${INSTALL} $? $@
+
+${UKDIR}/pthread_glock.h: pthread_glock.h
+       ${INSTALL} $? $@
+
+${UKDIR}/vice.h: vice.h
+       ${INSTALL} $? $@
+
+${UKDIR}/afs_uuid.c: uuid.c
+       ${INSTALL} $? $@
+
+${UKDIR}/afs_atomlist.c: afs_atomlist.c
+       ${INSTALL} $? $@
+
+${UKDIR}/afs_atomlist.h: afs_atomlist.h
+       ${INSTALL} $? $@
+
+${UKDIR}/afs_lhash.c: afs_lhash.c
+       ${INSTALL} $? $@
+
+${UKDIR}/afs_lhash.h: afs_lhash.h
+       ${INSTALL} $? $@
+
+#
+# Misc targets
+#
+
 clean:
        rm -f ${objects} sys
        rm -f util.a *.o core AFS_component_version_number.c
 
-beancount:
-       wc -l *.c *.h
-
 test:
        cd test; $(MAKE)
 
+include ../config/Makefile.version
index 5a7d267..eb167d2 100644 (file)
@@ -18,42 +18,42 @@ include ../config/Makefile.${SYS_NAME}
 INSTALLex = ${INSTALL} -m 755
 CCXPG2= /usr/xpg2bin/cc
 
-CFLAGS = ${OPTMZ} -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+CFLAGS = ${OPTMZ} -I${DESTDIR}/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 
-INCLS = ${DESTDIR}include/afs/afsint.h \
-       ${DESTDIR}include/afs/cmd.h \
-       ${DESTDIR}include/afs/afsutil.h
+INCLS = ${DESTDIR}/include/afs/afsint.h \
+       ${DESTDIR}/include/afs/cmd.h \
+       ${DESTDIR}/include/afs/afsutil.h
 
-VLIB = ${DESTDIR}lib/afs/
+VLIB = ${DESTDIR}/lib/afs/
 
-LIB = ${DESTDIR}lib/
+LIB = ${DESTDIR}/lib/
 
-FSLIBS = ${VLIB}libsys.a \
-        ${VLIB}libvldb.a \
-        ${LIB}libubik.a \
+FSLIBS = ${VLIB}/libsys.a \
+        ${VLIB}/libvldb.a \
+        ${LIB}/libubik.a \
         ${VLIB}vlib.a \
-        ${VLIB}libauth.a \
-        ${DESTDIR}lib/librxkad.a \
-        ${VLIB}libcom_err.a \
-        ${VLIB}libcmd.a \
-        ${VLIB}libkauth.a \
-        ${DESTDIR}lib/libdes.a \
-        ${LIB}librx.a \
-        ${VLIB}libsys.a \
+        ${VLIB}/libauth.a \
+        ${DESTDIR}/lib/librxkad.a \
+        ${VLIB}/libcom_err.a \
+        ${VLIB}/libcmd.a \
+        ${VLIB}/libkauth.a \
+        ${DESTDIR}/lib/libdes.a \
+        ${LIB}/librx.a \
+        ${VLIB}/libsys.a \
         $(VLIB)util.a \
-        ${LIB}liblwp.a \
-        ${VLIB}libaudit.a
-
-CMLIBS = ${VLIB}libsys.a \
-        ${VLIB}libafsint.a \
-        ${DESTDIR}lib/librxkad.a \
-        ${VLIB}libauth.a \
-        ${VLIB}libcom_err.a \
-        ${VLIB}libcmd.a \
-        ${LIB}librx.a \
-        ${VLIB}libsys.a \
+        ${LIB}/liblwp.a \
+        ${VLIB}/libaudit.a
+
+CMLIBS = ${VLIB}/libsys.a \
+        ${VLIB}/libafsint.a \
+        ${DESTDIR}/lib/librxkad.a \
+        ${VLIB}/libauth.a \
+        ${VLIB}/libcom_err.a \
+        ${VLIB}/libcmd.a \
+        ${LIB}/librx.a \
+        ${VLIB}/libsys.a \
         $(VLIB)util.a \
-        ${LIB}liblwp.a 
+        ${LIB}/liblwp.a 
 
 LIBS = ${FSLIBS} 
 
@@ -66,44 +66,44 @@ cacheout.o: cacheout.c
 
 all: fs up cmdebug fstrace kdump gcpags kdump64
 
-${DESTDIR}bin/fs ${DESTDIR}root.server/usr/afs/bin/fs: fs
+${DESTDIR}/bin/fs ${DESTDIR}root.server/usr/afs/bin/fs: fs
        ${INSTALL} -s $? $@
 
-${DESTDIR}bin/up: up
+${DESTDIR}/bin/up: up
        ${INSTALL} -s $? $@
 
-${DESTDIR}etc/fstrace: fstrace
+${DESTDIR}/etc/fstrace: fstrace
        ${INSTALL} -s $? $@
 
-${DESTDIR}bin/cmdebug: cmdebug
+${DESTDIR}/bin/cmdebug: cmdebug
        ${INSTALL} -s $? $@
 
-${DESTDIR}etc/kdump: kdump
+${DESTDIR}/etc/kdump: kdump
        -set -x; \
        case ${SYS_NAME} in \
        sgi_6? ) \
                ${INSTALLex} -f kdump.sh.sgi_ipnos $@; \
-               ln -fs kdump ${DESTDIR}etc/kdump32; \
-               ln -fs kdump.IP20 ${DESTDIR}etc/kdump.IP22; \
-               ln -fs kdump.IP20 ${DESTDIR}etc/kdump.IP32; \
+               ln -fs kdump ${DESTDIR}/etc/kdump32; \
+               ln -fs kdump.IP20 ${DESTDIR}/etc/kdump.IP22; \
+               ln -fs kdump.IP20 ${DESTDIR}/etc/kdump.IP32; \
                for f in kdump.IP??; \
-               do ${INSTALL} -s $$f ${DESTDIR}etc/$$f || exit $$? ; \
+               do ${INSTALL} -s $$f ${DESTDIR}/etc/$$f || exit $$? ; \
                done ;; \
        sun4x_5[78] ) \
                ${INSTALLex} -f kdump.sh.solaris7 $@; \
-               ${INSTALL} -s -f $? ${DESTDIR}etc/kdump32;; \
+               ${INSTALL} -s -f $? ${DESTDIR}/etc/kdump32;; \
        *linux* ) \
                for lv in ${LINUX_VERS}; do \
-                       ${INSTALL} -s kdump-$$lv ${DESTDIR}etc/kdump-$$lv ; \
+                       ${INSTALL} -s kdump-$$lv ${DESTDIR}/etc/kdump-$$lv ; \
                done ;; \
        hp_ux11* ) \
                ${INSTALLex} -f kdump.sh.hp_ux11 $@; \
-               ${INSTALL} -s -f $? ${DESTDIR}etc/kdump32;; \
+               ${INSTALL} -s -f $? ${DESTDIR}/etc/kdump32;; \
        *) \
                ${INSTALL} -s $? $@ ;; \
        esac
 
-${DESTDIR}etc/kdump64: kdump64
+${DESTDIR}/etc/kdump64: kdump64
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_5[78] | hp_ux11* ) \
@@ -113,9 +113,9 @@ ${DESTDIR}etc/kdump64: kdump64
        esac
 
 
-install: all ${DESTDIR}bin/fs ${DESTDIR}root.server/usr/afs/bin/fs \
-       ${DESTDIR}bin/up ${DESTDIR}etc/fstrace ${DESTDIR}bin/cmdebug \
-       ${DESTDIR}etc/kdump ${DESTDIR}etc/kdump64
+install: all ${DESTDIR}/bin/fs ${DESTDIR}root.server/usr/afs/bin/fs \
+       ${DESTDIR}/bin/up ${DESTDIR}/etc/fstrace ${DESTDIR}/bin/cmdebug \
+       ${DESTDIR}/etc/kdump ${DESTDIR}/etc/kdump64
 
 system: install
 
@@ -127,7 +127,7 @@ up: up.o
 fs.o: fs.c ${INCLS} AFS_component_version_number.c
 
 fs: fs.o $(LIBS)
-       ${CC} ${CFLAGS} -g -o fs fs.o ${DESTDIR}lib/afs/libprot.a $(LIBS) ${XLIBS}
+       ${CC} ${CFLAGS} -g -o fs fs.o ${DESTDIR}/lib/afs/libprot.a $(LIBS) ${XLIBS}
 
 twiddle: twiddle.c $(LIBS)
        ${CC} -g -o twiddle $(CFLAGS) twiddle.c $(LIBS) ${XLIBS}
@@ -143,21 +143,21 @@ whatfid: whatfid.o ${LIBS}
 fstrace.o: fstrace.c AFS_component_version_number.c
        case ${SYS_NAME} in \
                sun4_411 | sun4c_411 | sun4m_412 ) \
-                       ${CCXPG2} -g -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${SRCDIR}include -c fstrace.c ;; \
+                       ${CCXPG2} -g -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I${SRCDIR}/include -c fstrace.c ;; \
                * ) \
-                       ${CC} ${CFLAGS} -g -I${TOP_SRCDIR}/config -I${DESTDIR}include -I${SRCDIR}include -c fstrace.c ;; \
+                       ${CC} ${CFLAGS} -g -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I${SRCDIR}/include -c fstrace.c ;; \
        esac
 
 fstrace: fstrace.o
        case ${SYS_NAME} in \
                pmax_ul43 | pmax_ul43a ) \
-                       ${CC} ${CFLAGS} -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a /usr/lib/libi.a ;; \
+                       ${CC} ${CFLAGS} -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}/libcmd.a ${VLIB}util.a /usr/lib/libi.a ;; \
                sun4_411 | sun4c_411 | sun4m_412 ) \
-                       ${CCXPG2} ${CFLAGS} -g -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a ;; \
+                       ${CCXPG2} ${CFLAGS} -g -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}/libcmd.a ${VLIB}util.a ;; \
                hp700_ux100 | hp800_ux100 | hp?00_ux10? | hp_ux10? | hp_ux11?) \
-                       ${CC} -I${TOP_SRCDIR}/config  -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a ;; \
+                       ${CC} -I${TOP_SRCDIR}/config  -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}/libcmd.a ${VLIB}util.a ;; \
                * ) \
-                       ${CC} ${CFLAGS} -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}libcmd.a ${VLIB}util.a ;; \
+                       ${CC} ${CFLAGS} -o fstrace fstrace.o ${VLIB}/libsys.a ${VLIB}/libcmd.a ${VLIB}util.a ;; \
        esac
 
 cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c
@@ -170,11 +170,11 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
        case ${SYS_NAME} in \
                alpha_linux* ) \
                        for lv in ${LINUX_VERS}; do \
-                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-$$lv.o -c kdump.c ; \
+                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -mno-fp-regs -ffixed-8 -o kdump-$$lv.o -c kdump.c ; \
                                done ;; \
                *linux* ) \
                        for lv in ${LINUX_VERS}; do \
-                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -o kdump-$$lv.o -c kdump.c ; \
+                               ${CC} -g -I${LINUX_SRCDIR}$$lv/include -I${DESTDIR}/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -o kdump-$$lv.o -c kdump.c ; \
                        done ;; \
                alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c| alpha_dux?? ) \
                        ${CC} -g ${CFLAGS} -I/usr/sys/include -I/usr/sys/BINARY -I/usr/sys/AFS -DDEBUGGER -c kdump.c ;;\
@@ -186,14 +186,14 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
                                echo CPU_KDEFS = $$CPU_KDEFS; \
                                case $$CPU_KDEFS in \
                                *-64*)  ${CC} -D_KMEMUSER -woff 1178 \
-                                               -g -I${DESTDIR}include \
+                                               -g -I${DESTDIR}/include \
                                                -I${TOP_SRCDIR}/config \
                                                $$CPU_KDEFS \
                                                ${XCFLAGS64} \
                                                -c kdump.c -o kdump.$$IP.o \
                                        ;; \
                                *)      ${CC} -D_KMEMUSER -woff 1178 \
-                                               -g -I${DESTDIR}include \
+                                               -g -I${DESTDIR}/include \
                                                -I${TOP_SRCDIR}/config \
                                                $$CPU_KDEFS \
                                                ${XCFLAGS} -DAFS_32BIT_KERNEL_ENV \
@@ -203,23 +203,23 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
                        done \
                        ;; \
                *) \
-                       ${CC} -g -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS} -c kdump.c ;; \
+                       ${CC} -g -I${DESTDIR}/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS} -c kdump.c ;; \
        esac ;
 
 kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_5[78] | hp_ux11* ) \
-               ${CC} -g -I${DESTDIR}include -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \
+               ${CC} -g -I${DESTDIR}/include -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \
        esac
 
 kdump:  kdump.o
        -set -x; \
        case ${SYS_NAME} in \
        sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_54 | sun4c_54 | sun4m_54 | sunx86_54) \
-               ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \
+               ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a  ${DESTDIR}/lib/afs/util.a /usr/lib/libkvm.a -lelf ${XLIBS} ;; \
        sun4x_5? ) \
-               ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a  ${XLIBELFA}  ${XLIBKVM} ${XLIBS} ;; \
+               ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a  ${DESTDIR}/lib/afs/util.a  ${XLIBELFA}  ${XLIBKVM} ${XLIBS} ;; \
        sgi_6? ) \
                for f in ../libafs/STATIC.IP*/CPU_KDEFS; \
                do      IP=`expr "$$f" : '../libafs/STATIC.\(IP..\)'`; \
@@ -230,23 +230,23 @@ kdump:  kdump.o
                        *-64*)  ${CC} ${XCFLAGS64} -g \
                                        $$CPU_KDEFS \
                                        -o kdump.$$IP kdump.$$IP.o \
-                                       ${DESTDIR}lib/afs/libcmd64.a -lelf \
+                                       ${DESTDIR}/lib/afs/libcmd64.a -lelf \
                                ;; \
                        *)      ${CC} ${XCFLAGS} -g \
                                        $$CPU_KDEFS \
                                        -o kdump.$$IP kdump.$$IP.o \
-                                       ${DESTDIR}lib/afs/libcmd.a -lelf \
+                                       ${DESTDIR}/lib/afs/libcmd.a -lelf \
                                ;; \
                        esac || exit $$? ; \
                done ;; \
        *linux* ) \
                for lv in ${LINUX_VERS}; do \
-                       ${CC} -g -o kdump-$$lv kdump-$$lv.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a ${XLIBS} ; \
+                       ${CC} -g -o kdump-$$lv kdump-$$lv.o ${DESTDIR}/lib/afs/libcmd.a  ${DESTDIR}/lib/afs/util.a ${XLIBS} ; \
                done ;; \
        alpha_osf1 | alpha_osf20 |  alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux??) \
-               ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a ${XLIBS} -ll -lmld;; \
-       ncrx86_* ) ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a -lelf ${XLIBS} ;; \
-       * )     ${CC} -g -o kdump kdump.o ${DESTDIR}lib/afs/libcmd.a  ${DESTDIR}lib/afs/util.a ${XLIBS} ;; \
+               ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a  ${DESTDIR}/lib/afs/util.a ${XLIBS} -ll -lmld;; \
+       ncrx86_* ) ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a  ${DESTDIR}/lib/afs/util.a -lelf ${XLIBS} ;; \
+       * )     ${CC} -g -o kdump kdump.o ${DESTDIR}/lib/afs/libcmd.a  ${DESTDIR}/lib/afs/util.a ${XLIBS} ;; \
        esac
 
 ## kdump to read from 64 bit kernel dumps
@@ -255,15 +255,12 @@ kdump64 : kdump64.o
        -set -x; \
        case ${SYS_NAME} in \
        sun4x_5[78] | hp_ux11* )  \
-               ${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${DESTDIR}lib/afs/libcmd64.a ${XLIBELFA}  ${XLIBKVM} ${XLIBS} ;; \
+               ${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${DESTDIR}/lib/afs/libcmd64.a ${XLIBELFA}  ${XLIBKVM} ${XLIBS} ;; \
        esac
 
 clean:
        rm -f *.o *.a up fs core cmdebug AFS_component_version_number.c fstrace gcpags
 
-beancount:
-       wc -l *.c *.h
-
 test:
        cd test; $(MAKE)
 
index 64e4819..fbe8352 100644 (file)
@@ -16,8 +16,8 @@ include ../../config/Makefile.${SYS_NAME}
 
 OPTIMIZE=-O
 
-INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}include -I..
-LDIRS= -L${DESTDIR}lib -L${DESTDIR}lib/afs -L..
+INCDIRS= -I${TOP_SRCDIR}/config -I${DESTDIR}/include -I..
+LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L..
 LIBS= -lsys -lubik -lvldb -lauth -lrxkad -ldes -lcom_err -lcmd -lrx -llwp -lafsutil
 
 CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS}
index d4d3df1..1216a0d 100644 (file)
@@ -89,8 +89,3 @@ install: all ${MAN}
                         chmod 755 ${DESTDIR}/root.server/etc/bcheckrc ${DESTDIR}/root.server/etc/mount ${DESTDIR}/root.server/etc/umount ;\
                                ;;                                      \
        esac
-lint: ${SRCS}
-       lint ${CFLAGS} ${SRCS}
-
-tags: ${SRCS}
-       ctags ${SRCS}
index 2bd2124..9fefe28 100644 (file)
@@ -14,33 +14,29 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-DBUG = -g
-CFLAGS =  -DNINTERFACE ${DBUG} \
-       -I${TOP_SRCDIR}/config -I. -I${SRCDIR}include -I${SRCDIR}include/afs \
+CFLAGS =  -DNINTERFACE -I${TOP_SRCDIR}/config -I. -I${SRCDIR}/include -I${SRCDIR}/include/afs \
         ${XCFLAGS} -DRXDEBUG
+
 LDFLAGS = ${DBUG} ${XLDFLAGS}
 
-UTILLIB=${SRCDIR}lib/afs/util.a
-auditlib=${SRCDIR}lib/afs/libaudit.a
-
-LIBS=  ${SRCDIR}lib/afs/libacl.a       \
-       ${SRCDIR}lib/afs/libvldb.a      \
-       ${SRCDIR}lib/afs/libprot.a      \
-       ${SRCDIR}lib/afs/libauth.a      \
-       ${SRCDIR}lib/librxkad.a         \
-       ${SRCDIR}lib/libubik.a          \
-       ${SRCDIR}lib/afs/vlib.a         \
-       ${SRCDIR}lib/afs/libdir.a       \
-       ${UTILLIB}                      \
-       ${SRCDIR}lib/afs/libsys.a       \
-       ${SRCDIR}lib/afs/libafsint.a    \
-       ${SRCDIR}lib/librxstat.a        \
-       ${SRCDIR}lib/librx.a            \
-       ${SRCDIR}lib/afs/libsys.a       \
-       ${SRCDIR}lib/libdes.a           \
-       ${SRCDIR}lib/afs/libcom_err.a   \
-       ${SRCDIR}lib/afs/util.a         \
-       ${SRCDIR}lib/liblwp.a 
+LIBS=  ${SRCDIR}/lib/afs/libacl.a      \
+       ${SRCDIR}/lib/afs/libvldb.a     \
+       ${SRCDIR}/lib/afs/libprot.a     \
+       ${SRCDIR}/lib/afs/libauth.a     \
+       ${SRCDIR}/lib/librxkad.a                \
+       ${SRCDIR}/lib/libubik.a                 \
+       ${SRCDIR}/lib/afs/vlib.a                \
+       ${SRCDIR}/lib/afs/libdir.a      \
+       ${SRCDIR}/lib/afs/util.a                \
+       ${SRCDIR}/lib/afs/libsys.a      \
+       ${SRCDIR}/lib/afs/libafsint.a   \
+       ${SRCDIR}/lib/librxstat.a       \
+       ${SRCDIR}/lib/librx.a           \
+       ${SRCDIR}/lib/afs/libsys.a      \
+       ${SRCDIR}/lib/libdes.a          \
+       ${SRCDIR}/lib/afs/libcom_err.a  \
+       ${SRCDIR}/lib/afs/util.a                \
+       ${SRCDIR}/lib/liblwp.a 
 
 headers=${SRCDIR}include/lwp.h         \
        ${SRCDIR}include/afs/acl.h      \
@@ -63,33 +59,27 @@ objects=viced.o             \
        physio.o        \
        callback.o      
 
-include ../config/Makefile.version
-
-noversion: install
+all: install
 
-all: cbd fsprobe check_sysid
+${objects}: ${headers}
 
-${objects}:${headers}
 viced.o: AFS_component_version_number.o
 
 check_sysid: check_sysid.c
-       ${CC} ${CFLAGS} -IDEST/include -o check_sysid check_sysid.c
+       ${CC} ${CFLAGS} -o check_sysid check_sysid.c
 
-fileserver: viced.o ${objects} ${headers} ${LIBS}
+fileserver: ${objects} ${headers} ${LIBS}
        set -x; \
        case ${SYS_NAME} in \
-       *linux* | *fbsd* ) \
-           ${CC} ${LDFLAGS} -o fileserver ${objects} \
-           ${auditlib} ${LIBS} ${XLIBS} ;; \
        rs_aix*) \
            ${CC} -K ${LDFLAGS} -o fileserver ${objects} \
-           ${auditlib} ${LIBS} ${XLIBS} ;; \
+           ${SRCDIR}/lib/afs/libaudit.a ${LIBS} ${XLIBS} ;; \
        *) \
            ${CC} ${LDFLAGS} -o fileserver ${objects} \
-           ${auditlib} ${LIBS} ${XLIBS} ;; \
+           ${SRCDIR}/lib/afs/libaudit.a ${LIBS} ${XLIBS} ;; \
        esac
 
-fsprobe.o: fsprobe.c  AFS_component_version_number.c
+fsprobe.o: fsprobe.c AFS_component_version_number.c
        ${CC} ${CFLAGS} -DINTERPRET_DUMP -c fsprobe.c
 
 fsprobe: fsprobe.o
@@ -101,25 +91,22 @@ cbd.o: callback.c AFS_component_version_number.c
 cbd: cbd.o
        ${CC} ${CFLAGS} -DINTERPRET_DUMP -o cbd cbd.o ${LIBS} ${XLIBS}  
 
-lint:
-       lint -uvn  -I${SRCDIR}include viced.c afsfileprocs.c host.c physio.c callback.c ${SRCDIR}lib/afs/llib-lutil.ln
-
-${DESTDIR}root.server/usr/afs/bin/fileserver : fileserver
+${DESTDIR}/root.server/usr/afs/bin/fileserver: fileserver
        @case ${SYS_NAME} in \
        alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*) \
        echo "Don't install fileserver for ${SYS_NAME}" ;; \
        *) \
-       echo ${INSTALL} -ns fileserver ${DESTDIR}root.server/usr/afs/bin/fileserver ; \
-       ${INSTALL} -ns fileserver ${DESTDIR}root.server/usr/afs/bin/fileserver ;; \
+       echo ${INSTALL} -ns fileserver ${DESTDIR}/root.server/usr/afs/bin/fileserver ; \
+       ${INSTALL} -ns fileserver ${DESTDIR}/root.server/usr/afs/bin/fileserver ;; \
        esac
 
-install: all  ${DESTDIR}root.server/usr/afs/bin/fileserver
-       ${INSTALL} fs_stats.h ${DESTDIR}/include/afs
+${DESTDIR}/include/afs/fs_stats.h: fs_stats.h
+       ${INSTALL} $? $@
 
-system: install
+install: cbd fsprobe check_sysid ${DESTDIR}/root.server/usr/afs/bin/fileserver \
+       ${DESTDIR}/include/afs/fs_stats.h
 
 clean:
-       rm -f *.o llib-lvice.ln fileserver core AFS_component_version_number.c cbd check_sysid fsprobe
+       rm -f *.o fileserver core AFS_component_version_number.c cbd check_sysid fsprobe
 
-beancount:
-       wc -l *.c *.h
+include ../config/Makefile.version
index f942ac6..e25c6f2 100644 (file)
@@ -17,34 +17,34 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 KERNELDIR=../libafs/
 UKERNELDIR=../libuafs/
-COMPILE_ET = ${SRCDIR}bin/compile_et
-
-CFLAGS = ${DBUG} -I. -I.. -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
-INCLS=${SRCDIR}include/ubik.h \
-             ${SRCDIR}include/lwp.h \
-             ${SRCDIR}include/lock.h  \
-             ${SRCDIR}include/rx/rx.h \
-             ${SRCDIR}include/rx/xdr.h \
-             ${SRCDIR}include/afs/keys.h \
-             ${SRCDIR}include/afs/cellconfig.h \
+COMPILE_ET = ${SRCDIR}/bin/compile_et
+
+CFLAGS = ${DBUG} -I. -I.. -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
+INCLS=${SRCDIR}/include/ubik.h \
+             ${SRCDIR}/include/lwp.h \
+             ${SRCDIR}/include/lock.h  \
+             ${SRCDIR}/include/rx/rx.h \
+             ${SRCDIR}/include/rx/xdr.h \
+             ${SRCDIR}/include/afs/keys.h \
+             ${SRCDIR}/include/afs/cellconfig.h \
        vlserver.h vlclient.h vldbint.h
 
 LIBS = \
-       ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/librxstat.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/util.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/util.a
-
-auditlib=${SRCDIR}lib/afs/libaudit.a
-
-RXGEN=${SRCDIR}bin/rxgen
+       ${SRCDIR}/lib/libubik.a \
+       ${SRCDIR}/lib/afs/libauth.a \
+       ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/librxstat.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/libdes.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/util.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/afs/util.a
+
+auditlib=${SRCDIR}/lib/afs/libaudit.a
+
+RXGEN=${SRCDIR}/bin/rxgen
 KSRCS=Kvldbint.cs.c Kvldbint.xdr.c vl_opcodes.h vldbint.h
 UKSRCS=$(KSRCS)
 
@@ -65,11 +65,11 @@ clean:
 
 vldb_check: vldb_check.c
        $(CC) ${CFLAGS} -o vldb_check vldb_check.c ${XLIBS} \
-               ${DESTDIR}lib/afs/libcmd.a ${DESTDIR}lib/afs/util.a
+               ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/util.a
 
 cnvldb: cnvldb.o 
-       $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${XLIBS} ${DESTDIR}lib/afs/libcmd.a\
-                ${DESTDIR}lib/afs/util.a                
+       $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${XLIBS} ${DESTDIR}/lib/afs/libcmd.a\
+                ${DESTDIR}/lib/afs/util.a               
 
 cnvldb.o: cnvldb.c cnvldb.h AFS_component_version_number.o
 
@@ -101,7 +101,7 @@ libvldb.a: $(OBJS) AFS_component_version_number.o
        $(RANLIB) libvldb.a
 
 vlclient: vlclient.o libvldb.a $(LIBS)
-       $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${DESTDIR}lib/afs/libcmd.a
+       $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${DESTDIR}/lib/afs/libcmd.a
 
 vlclient.o: vlclient.c ${INCLS} AFS_component_version_number.o
 
@@ -112,11 +112,11 @@ vlserver.h vl_errors.c: vl_errors.et vlserver.p.h
 system: install
 
 kinstall: $(KSRCS)
-       ${INSTALL} $(KSRCS) ${KERNELDIR}afsint
+       ${INSTALL} $(KSRCS) ${KERNELDIR}/afsint
 
 ukinstall webinstall: $(UKSRCS)
-       set ${UKERNELDIR}afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} $(UKSRCS) ${UKERNELDIR}afsint
+       set ${UKERNELDIR}/afsint; $(MKDIR_IF_NEEDED)
+       ${INSTALL} $(UKSRCS) ${TKERNELDIR}/afsint
 
 ${DESTDIR}root.server/usr/afs/bin/vlserver: vlserver
        ${INSTALL} vlserver ${DESTDIR}root.server/usr/afs/bin
@@ -125,12 +125,12 @@ ${DESTDIR}/etc/vldb_convert: cnvldb
        ${INSTALL} -f cnvldb ${DESTDIR}/etc/vldb_convert
 
 install: kinstall ukinstall vlserver vlclient libvldb.a cnvldb ${DESTDIR}root.server/usr/afs/bin/vlserver ${DESTDIR}/etc/vldb_convert vldb_check
-       ${INSTALL} libvldb.a ${DESTDIR}lib/afs
-       ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}include/afs
-       ${INSTALL} cnvldb.h ${DESTDIR}include/afs
+       ${INSTALL} libvldb.a ${DESTDIR}/lib/afs
+       ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}/include/afs
+       ${INSTALL} cnvldb.h ${DESTDIR}/include/afs
        ${INSTALL} vldb_check ${DESTDIR}/etc
 
 libinstall: libvldb.a
-       ${INSTALL} libvldb.a ${DESTDIR}lib/afs
-       ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}include/afs
-       ${INSTALL} cnvldb.h ${DESTDIR}include/afs
+       ${INSTALL} libvldb.a ${DESTDIR}/lib/afs
+       ${INSTALL} vl_opcodes.h vlserver.h vldbint.h ${DESTDIR}/include/afs
+       ${INSTALL} cnvldb.h ${DESTDIR}/include/afs
index 8361bfb..dcf23b9 100644 (file)
@@ -15,12 +15,12 @@ SHELL=/bin/sh
 include ../config/Makefile.${SYS_NAME}
 include ../config/Makefile.version
 
-INCDIRS= -I${TOP_SRCDIR}/config -I. -I${DESTDIR}include ${FSINCLUDES}
+INCDIRS= -I${TOP_SRCDIR}/config -I. -I${DESTDIR}/include ${FSINCLUDES}
 LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS}
 
-LIBS= ${DESTDIR}lib/afs/libcmd.a vlib.a ${SRCDIR}lib/afs/util.a \
-       ${DESTDIR}lib/afs/libsys.a ${DESTDIR}lib/afs/libdir.a \
-       ${DESTDIR}lib/liblwp.a  ${DESTDIR}lib/afs/libacl.a ${XLIBS}
+LIBS= ${DESTDIR}/lib/afs/libcmd.a vlib.a ${SRCDIR}/lib/afs/util.a \
+       ${DESTDIR}/lib/afs/libsys.a ${DESTDIR}/lib/afs/libdir.a \
+       ${DESTDIR}/lib/liblwp.a  ${DESTDIR}/lib/afs/libacl.a ${XLIBS}
 
 CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBG}
 
@@ -36,8 +36,8 @@ VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync.o purge.o \
 
 OBJECTS=${VLIBOBJS} physio.o vol-salvage.o vol-info.o 
 
-all:   ${DESTDIR}lib/afs/vlib.a \
-       ${DESTDIR}lib/afs/libvlib.a \
+all:   ${DESTDIR}/lib/afs/vlib.a \
+       ${DESTDIR}/lib/afs/libvlib.a \
        ${DESTDIR}root.server/usr/afs/bin/salvager \
        ${DESTDIR}root.server/usr/afs/bin/volinfo \
        gi
@@ -53,10 +53,10 @@ ${DESTDIR}root.server/usr/afs/bin/salvager: salvager
 ${DESTDIR}root.server/usr/afs/bin/volinfo: volinfo
        ${INSTALL} -s $? $@
 
-${DESTDIR}lib/afs/vlib.a: vlib.a
+${DESTDIR}/lib/afs/vlib.a: vlib.a
        ${INSTALL} $? $@
 
-${DESTDIR}lib/afs/libvlib.a: vlib.a
+${DESTDIR}/lib/afs/libvlib.a: vlib.a
        ${INSTALL} $? $@
 
 $(DESTDIR)root.server/usr/afs/bin/fs_conv_dux40D:  fs_conv_dux40D
@@ -69,11 +69,11 @@ $(DESTDIR)root.server/usr/afs/bin/fs_conv_sol26:  fs_conv_sol26
           ${INSTALL} -s $? $@
 
 install: all $(FS_CONV_OSF40D) $(XFS_SIZE_CHECK) $(FS_CONV_SOL26)
-       ${INSTALL} ${PUBLICHEADERS} ${DESTDIR}include/afs
+       ${INSTALL} ${PUBLICHEADERS} ${DESTDIR}/include/afs
 
 
-${OBJECTS}: ${PUBLICHEADERS} ${SRCDIR}include/lwp.h ${SRCDIR}include/lock.h \
-        ${SRCDIR}include/afs/afsint.h vutils.h salvage.h\
+${OBJECTS}: ${PUBLICHEADERS} ${SRCDIR}/include/lwp.h ${SRCDIR}/include/lock.h \
+        ${SRCDIR}/include/afs/afsint.h vutils.h salvage.h\
        AFS_component_version_number.c
 
 vol-salvage.o vutil.o: volinodes.h
@@ -120,10 +120,10 @@ volinfo: vol-info.o physio.o ihandle.o
 
 
 fs_conv_dux40D: fs_conv_411.o
-       ${CC} ${CFLAGS} ${DESTDIR}lib/afs/libcmd.a -o fs_conv_dux40D fs_conv_411.o  ${LIBS} 
+       ${CC} ${CFLAGS} ${DESTDIR}/lib/afs/libcmd.a -o fs_conv_dux40D fs_conv_411.o  ${LIBS} 
 
 fs_conv_sol26: fs_conv_411.o vlib.a 
-       ${CC} ${CFLAGS} ${DESTDIR}lib/afs/libcmd.a -o fs_conv_sol26 fs_conv_411.o  ${LIBS} 
+       ${CC} ${CFLAGS} ${DESTDIR}/lib/afs/libcmd.a -o fs_conv_sol26 fs_conv_411.o  ${LIBS} 
 
 fs_conv_411.o: fs_conv_411.c AFS_component_version_number.c
        ${CC} ${CFLAGS} -c fs_conv_411.c
@@ -135,9 +135,5 @@ clean:
        rm -f *.o *.a AFS_component_version_number.c
        rm -f ${SCMPROGS} ${STAGEPROGS} core salvager volinfo gi fs_conv_sol26 fs_conv_dux40D
 
-
-beancount:
-       wc -l *.c *.h
-
 test:
        cd test; $(MAKE)
index fb30a0e..f66e3bb 100644 (file)
@@ -14,16 +14,16 @@ SHELL=/bin/sh
 
 include ../../config/Makefile.${SYS_NAME}
 
-INCDIRS= -I. -I.. -I${DESTDIR}include ${FSINCLUDES}
-INSTALL = ${SRCDIR}bin/install
+INCDIRS= -I. -I.. -I${DESTDIR}/include ${FSINCLUDES}
+INSTALL = ${SRCDIR}/bin/install
 LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS}
 
-LIBS= ${DESTDIR}lib/afs/libcmd.a ${DESTDIR}lib/afs/vlib.a \
-       ${SRCDIR}lib/afs/util.a \
-       ${DESTDIR}lib/afs/libsys.a ${DESTDIR}lib/afs/libdir.a \
-       ${DESTDIR}lib/liblwp.a  ${DESTDIR}lib/afs/libacl.a ${XLIBS}
+LIBS= ${DESTDIR}/lib/afs/libcmd.a ${DESTDIR}/lib/afs/vlib.a \
+       ${SRCDIR}/lib/afs/util.a \
+       ${DESTDIR}/lib/afs/libsys.a ${DESTDIR}/lib/afs/libdir.a \
+       ${DESTDIR}/lib/liblwp.a  ${DESTDIR}/lib/afs/libacl.a ${XLIBS}
 
-NAMEI_LIBS = ../vlib.a ${SRCDIR}lib/afs/util.a ${DESTDIR}lib/liblwp.a
+NAMEI_LIBS = ../vlib.a ${SRCDIR}/lib/afs/util.a ${DESTDIR}/lib/liblwp.a
 
 CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} -g
 
@@ -41,8 +41,8 @@ kinstall:
 
 install:  listVicepx updateDirInode testpart
 
-${OBJECTS}:    ${PUBLICHEADERS} ${SRCDIR}include/lwp.h \
-               ${SRCDIR}include/lock.h  ${SRCDIR}include/afs/afsint.h \
+${OBJECTS}:    ${PUBLICHEADERS} ${SRCDIR}/include/lwp.h \
+               ${SRCDIR}/include/lock.h  ${SRCDIR}/include/afs/afsint.h \
                ../filesignal.h ../vutils.h ../vldb.h ../salvage.h \
                ../volinodes.h ../qiin.h 
 
@@ -52,8 +52,8 @@ listVicepx.o: listVicepx.c  utilities.c
 
 testpart:      testpart.c ../vlib.a
                ${CC} ${CFLAGS} ${LDFLAGS} -o $@ testpart.c \
-               ${DESTDIR}lib/afs/vlib.a ${DESTDIR}lib/liblwp.a \
-               ${DESTDIR}lib/afs/util.a ${XLIBS}
+               ${DESTDIR}/lib/afs/vlib.a ${DESTDIR}/lib/liblwp.a \
+               ${DESTDIR}/lib/afs/util.a ${XLIBS}
                
 
 listVicepx:    listVicepx.o utilities.o 
@@ -79,11 +79,8 @@ nilist: nilist.o nsubr.o
        ${CC} ${CFLAGS} -o nilist nilist.o nsubr.o ${NAMEI_LIBS}
 
 nino: nino.o
-       ${CC} ${CFLAGS} -o nino nino.o ${DESTDIR}lib/afs/util.a
+       ${CC} ${CFLAGS} -o nino nino.o ${DESTDIR}/lib/afs/util.a
 
 clean:
        rm -f *.o *.a 
        rm -f ${SCMPROGS} ${STAGEPROGS} core listVicepx updateDirInode
-
-beancount:
-       wc -l *.c *.h
index 40ad2bc..4a12eb7 100644 (file)
@@ -14,67 +14,65 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-COMPILE_ET=${SRCDIR}bin/compile_et
-CFLAGS=${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}include ${XCFLAGS}
+COMPILE_ET=${SRCDIR}/bin/compile_et
+CFLAGS=${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS}
 
-INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}include/afs -I${SRCDIR}include
-INCLIBS=-L${SRCDIR}lib/afs -L${SRCDIR}lib
+INCDIRS= -I${TOP_SRCDIR}/config -I${SRCDIR}/include/afs -I${SRCDIR}/include
+INCLIBS=-L${SRCDIR}/lib/afs -L${SRCDIR}/lib
 
-VINCLS=${SRCDIR}include/afs/partition.h ${SRCDIR}include/afs/volume.h \
-       ${SRCDIR}include/afs/vlserver.h vol.h dump.h volser.h  lockdata.h 
+VINCLS=${SRCDIR}/include/afs/partition.h ${SRCDIR}/include/afs/volume.h \
+       ${SRCDIR}/include/afs/vlserver.h vol.h dump.h volser.h  lockdata.h 
 
-RINCLS=${SRCDIR}include/rx/rx.h ${SRCDIR}include/rx/xdr.h \
-       ${SRCDIR}include/afs/keys.h ${SRCDIR}include/afs/cellconfig.h \
-       ${SRCDIR}include/ubik.h ${SRCDIR}include/afs/cmd.h
+RINCLS=${SRCDIR}/include/rx/rx.h ${SRCDIR}/include/rx/xdr.h \
+       ${SRCDIR}/include/afs/keys.h ${SRCDIR}/include/afs/cellconfig.h \
+       ${SRCDIR}/include/ubik.h ${SRCDIR}/include/afs/cmd.h
 
-TARGETS= ${DESTDIR}include/afs/volser.h \
-        ${DESTDIR}include/afs/volint.h \
-        ${DESTDIR}etc/vos \
+TARGETS= ${DESTDIR}/include/afs/volser.h \
+        ${DESTDIR}/include/afs/volint.h \
+        ${DESTDIR}/etc/vos \
         ${DESTDIR}root.server/usr/afs/bin/vos \
         ${DESTDIR}root.server/usr/afs/bin/volserver \
-        ${DESTDIR}lib/afs/libvolser.a 
+        ${DESTDIR}/lib/afs/libvolser.a 
 
 INTINCLS=volint.h volser.h 
 
-HACKS=${SRCDIR}lib/afs/libdir.a
+HACKS=${SRCDIR}/lib/afs/libdir.a
 
 LIBS= \
-       ${SRCDIR}lib/afs/libaudit.a \
-       ${SRCDIR}lib/afs/vlib.a \
+       ${SRCDIR}/lib/afs/libaudit.a \
+       ${SRCDIR}/lib/afs/vlib.a \
        ${SRCDIR}/lib/afs/libacl.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/libvldb.a \
-       ${SRCDIR}lib/libubik.a \
-       ${SRCDIR}lib/afs/libauth.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/librxkad.a \
-       ${SRCDIR}lib/libdes.a \
-       ${SRCDIR}lib/librxstat.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/libcom_err.a \
-       ${SRCDIR}lib/afs/libkauth.a \
-       ${SRCDIR}lib/afs/libusd.a \
-       ${SRCDIR}lib/afs/util.a
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/afs/libvldb.a \
+       ${SRCDIR}/lib/libubik.a \
+       ${SRCDIR}/lib/afs/libauth.a \
+       ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/librxkad.a \
+       ${SRCDIR}/lib/libdes.a \
+       ${SRCDIR}/lib/librxstat.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/afs/libcom_err.a \
+       ${SRCDIR}/lib/afs/libkauth.a \
+       ${SRCDIR}/lib/afs/libusd.a \
+       ${SRCDIR}/lib/afs/util.a
 
 VSOBJS=vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o 
 SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \
  volint.cs.o dumpstuff.o  volint.ss.o volint.xdr.o
 COBJS=volint.cs.o volint.xdr.o
 
-include ../config/Makefile.version
-
 all: volserver libvolser.a vos restorevol
 
 restorevol: restorevol.c
-       ${CC} -g ${CFLAGS} -o restorevol restorevol.c \
-               ${SRCDIR}lib/afs/libcmd.a ${SRCDIR}lib/afs/util.a
-       ${INSTALL} restorevol ${SRCDIR}etc
+       ${CC} ${CFLAGS} -o restorevol restorevol.c \
+               ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/afs/util.a
+       ${INSTALL} restorevol ${SRCDIR}/etc
 
 vos: vos.o ${VSOBJS} libvolser.a ${LIBS}
-       ${CC} ${LDFLAGS} -g -o vos vos.o $(VSOBJS) libvolser.a  ${LIBS} \
+       ${CC} ${LDFLAGS} -o vos vos.o $(VSOBJS) libvolser.a  ${LIBS} \
                ${XLIBS}
 
 libvolser.a: volint.cs.o  $(VSOBJS) volint.ss.o AFS_component_version_number.o
@@ -87,7 +85,7 @@ volser.h volerr.c: volerr.et volser.p.h
        rm -f volser.h volerr.c; ${COMPILE_ET} volerr -h volser
 
 volint.h volint.ss.c volint.cs.c volint.xdr.c: volint.xg
-       ${SRCDIR}bin/rxgen -x volint.xg
+       ${SRCDIR}/bin/rxgen -x volint.xg
 
 vsutils.o: vsutils.c ${VINCLS} ${RINCLS} ${INTINCLS}
 
@@ -106,27 +104,21 @@ volint.ss.o: volint.ss.c ${INTINCLS}
 volint.xdr.o: volint.xdr.c ${INTINCLS}
 
 volserver: $(SOBJS) $(LIBS) $(HACKS)
-       case ${SYS_NAME} in \
-                *linux* | *fbsd* ) \
-                        ${CC} ${DBUG} -o volserver $(SOBJS) $(HACKS) \
-                               ${LDFLAGS} $(LIBS) ${XLIBS} ;; \
-                *) \
-                        ${CC} ${DBUG} -g -o volserver $(SOBJS) $(HACKS) \
-                               ${LDFLAGS} $(LIBS) ${XLIBS} ;; \
-        esac
-
-noversion system: install
-
-${DESTDIR}include/afs/volser.h :: volser.h
+       ${CC} ${DBUG} -o volserver $(SOBJS) $(HACKS) \
+               ${LDFLAGS} $(LIBS) ${XLIBS}
+
+system: install
+
+${DESTDIR}/include/afs/volser.h :: volser.h
        ${INSTALL} $? $@
 
-${DESTDIR}include/afs/volint.h :: volint.h
+${DESTDIR}/include/afs/volint.h :: volint.h
        ${INSTALL} $? $@
 
-${DESTDIR}etc/vos ${DESTDIR}root.server/usr/afs/bin/vos :: vos
+${DESTDIR}/etc/vos ${DESTDIR}root.server/usr/afs/bin/vos :: vos
        ${INSTALL} $? $@
 
-${DESTDIR}lib/afs/libvolser.a :: libvolser.a
+${DESTDIR}/lib/afs/libvolser.a :: libvolser.a
        ${INSTALL} $? $@
 
 ${DESTDIR}root.server/usr/afs/bin/volserver :: volserver
@@ -138,9 +130,5 @@ clean:
        rm -f volserver *.o volint.ss.c volint.cs.c *.a  volint.h \
        volint.xdr.c vos core volser.h volerr.c AFS_component_version_number.c restorevol
 
-lint:  vos.c vsprocs.c volmain.c volprocs.c lockprocs.c
-       lint -hb ${INCDIRS} ${INCLIBS} vos.c
-       lint -hb ${INCDIRS} ${INCLIBS} vsprocs.c
-       lint -hb  ${INCDIRS} ${INCLIBS} volmain.c
-       lint -hb ${INCDIRS} ${INCLIBS}  volprocs.c
-       lint -hb ${INCDIRS} ${INCLIBS} lockprocs.c
+include ../config/Makefile.version
+
index 138902a..3b33cab 100644 (file)
@@ -18,21 +18,21 @@ include ../config/Makefile.${SYS_NAME}
 
 CFLAGS= ${DBUG} -I. \
        -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}include \
-       -I${SRCDIR}include/afs \
+       -I${SRCDIR}/include \
+       -I${SRCDIR}/include/afs \
        -I${SRCDIR} \
        -I/usr/include ${XCFLAGS}
 
-RPCINCLS=${SRCDIR}include/lwp.h ${SRCDIR}include/rx/rx.h
+RPCINCLS=${SRCDIR}/include/lwp.h ${SRCDIR}/include/rx/rx.h
 FSINCLS=xstat_fs.h ${RPCINCLS}
 CMINCLS=xstat_cm.h ${RPCINCLS}
 
-AFSLIBS=${SRCDIR}lib/afs/libafsint.a \
-       ${SRCDIR}lib/afs/libcmd.a \
-       ${SRCDIR}lib/librx.a \
-       ${SRCDIR}lib/liblwp.a \
-       ${SRCDIR}lib/afs/libsys.a \
-       ${SRCDIR}lib/afs/util.a
+AFSLIBS=${SRCDIR}/lib/afs/libafsint.a \
+       ${SRCDIR}/lib/afs/libcmd.a \
+       ${SRCDIR}/lib/librx.a \
+       ${SRCDIR}/lib/liblwp.a \
+       ${SRCDIR}/lib/afs/libsys.a \
+       ${SRCDIR}/lib/afs/util.a
 
 LIBS = ${AFSLIBS} 
 
@@ -85,12 +85,12 @@ xstat_cm_test: xstat_cm_test.o libxstat_cm.a ${LIBS}
 system: install
 
 install: all
-       ${INSTALL} xstat_fs.h    ${DESTDIR}include/afs
-       ${INSTALL} xstat_cm.h    ${DESTDIR}include/afs
-       ${INSTALL} libxstat_fs.a ${DESTDIR}lib/afs
-       ${INSTALL} libxstat_cm.a ${DESTDIR}lib/afs
-       ${INSTALL} xstat_fs_test ${DESTDIR}bin
-       ${INSTALL} xstat_cm_test ${DESTDIR}bin
+       ${INSTALL} xstat_fs.h    ${DESTDIR}/include/afs
+       ${INSTALL} xstat_cm.h    ${DESTDIR}/include/afs
+       ${INSTALL} libxstat_fs.a ${DESTDIR}/lib/afs
+       ${INSTALL} libxstat_cm.a ${DESTDIR}/lib/afs
+       ${INSTALL} xstat_fs_test ${DESTDIR}/bin
+       ${INSTALL} xstat_cm_test ${DESTDIR}/bin
 
 clean:
        rm -f *.o \