aix-fix-objdir-build-20020521

[openafs.git] / src / sys / Makefile.in

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index 7acb0fe..a7bf5c1 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -5,36 +5,8 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-# System calls.
-
-DEST=@DEST@
-TOP_INCDIR=@TOP_INCDIR@
-TOP_LIBDIR=@TOP_LIBDIR@
-TOP_OBJDIR=@TOP_OBJDIR@
 srcdir=@srcdir@
-VPATH=${srcdir}
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-sbindir=@sbindir@
-libexecdir=@libexecdir@
-libdir=@libdir@
-includedir=@includedir@
-mandir=@mandir@
-afssrvbindir=@afssrvbindir@
-afssrvsbindir=@afssrvsbindir@
-afssrvlibexecdir=@afssrvlibexecdir@
-COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
-RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
-TOP_SRCDIR=@TOP_SRCDIR@
-SYS_NAME=@AFS_SYSNAME@
-
-SHELL = /bin/sh
-
-include ../config/Makefile.${SYS_NAME}
-
-UKERNELDIR=../libuafs
-KERNELDIR=../libafs
+include @TOP_OBJDIR@/src/config/Makefile.config
 
 CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}  ${XCFLAGS}
 SFLAGS=-P -I${TOP_INCDIR}
@@ -55,13 +27,17 @@ all: \
        ${KERNELDIR}/afs \
        ${KERNELDIR}/afs/xfsattrs.h \
        ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/afs/afs.exp
+       ${UKERNELDIR}/afs/afsl.exp
 
 libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
        -$(RM) -f $@
        $(AR) crv $@ ${OBJECTS} ${RMTOBJS} \
                AFS_component_version_number.o ${LIBSYS_AIX_EXP}
        $(RANLIB) $@
+       case "${SYS_NAME}" in                           \
+               rs_aix*)                                \
+                       $(AR) crv $@ ${srcdir}/afsl.exp;;         \
+       esac
 
 tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd
 
@@ -79,7 +55,7 @@ syscall.o: syscall.s
                $(RM) -f syscall.ss syscall.i;; \
         hp_ux11? ) \
                touch syscall.o;; \
-       i386_*bsd* ) \
+       i386_*bsd*|*nbsd*) \
                touch syscall.o;; \
         *) \
                /lib/cpp  ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
@@ -95,13 +71,13 @@ rmtsysd: AFS_component_version_number.o
 
 rmtsys.cs.c: rmtsys.xg
        ${RXGEN} -C -o $@ ${srcdir}/rmtsys.xg
-       
+
 rmtsys.ss.c: rmtsys.xg
        ${RXGEN} -S -o $@ ${srcdir}/rmtsys.xg
-       
+
 rmtsys.xdr.c: rmtsys.xg
        ${RXGEN} -c -o $@ ${srcdir}/rmtsys.xg
-       
+
 rmtsys.h: rmtsys.xg
        ${RXGEN} -h -o $@ ${srcdir}/rmtsys.xg
 
@@ -173,7 +149,7 @@ ${TOP_LIBDIR}/libsys.a: libsys.a
 ${UKERNELDIR}/afs:
        mkdir -p $@
 
-${UKERNELDIR}/afs/afs.exp: afs.exp
+${UKERNELDIR}/afs/afsl.exp: afsl.exp
        ${INSTALL} $? $@
 
 ${KERNELDIR}/afs:
@@ -182,7 +158,7 @@ ${KERNELDIR}/afs:
 ${KERNELDIR}/afs/xfsattrs.h: xfsattrs.h
        ${INSTALL} $? $@
 
-install: 
+install: \
        ${DESTDIR}${libdir}/afs/libsys.a \
        ${DESTDIR}${sbindir}/rmtsysd \
        ${DESTDIR}${includedir}/afs/afssyscalls.h \