i386-user-mode-linux-support-20030513

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

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index 317cb7e..7c7c020 100644 (file)
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -8,25 +8,22 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
-all: kinstall ukinstall ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h
+all: depinstall
+
+depinstall: ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h \
+       ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h afszcm.cat AFS_component_version_number.c ${TOP_INCDIR}/afs/unified_afs.h
        case ${SYS_NAME} in \
                pmax_ul43 | pmax_ul43a) \
                        ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \
        esac
 
-# NOTE: linux case uses --new as well to work around bug in some versions of
-# gencat.
-kinstall: ${KERNELDIR}/afs AFS_component_version_number.c afszcm.cat
-       -chmod 666 ${KERNELDIR}/afs/*
-       ${INSTALL} ${srcdir}/*.[csh] ${KERNELDIR}/afs
-       -${INSTALL} *.[csh] ${KERNELDIR}/afs
-       ${INSTALL} ${srcdir}/VNOPS/*.[csh] ${KERNELDIR}/afs
-       ${INSTALL} ${srcdir}/${MKAFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs
-       -${INSTALL} ${MKAFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs
-
 afs_trace.h afs_trace.msf: afs_trace.et
        ${COMPILE_ET} -v 2 -p ${srcdir} afs_trace.et
 
+unified_afs.c unified_afs.h: unified_afs.et
+       $(RM) -f unified_afs.c unified_afs.h
+       ${COMPILE_ET} -p ${srcdir} unified_afs -h unified_afs
+
 afszcm.cat: afs_trace.msf
        -$(RM) -f afszcm.cat
        case ${SYS_NAME} in \
@@ -34,7 +31,7 @@ afszcm.cat: afs_trace.msf
                        gencat -m afszcm.cat afs_trace.msf ;; \
                sun*_4* ) \
                        /usr/etc/gencat afszcm.cat afs_trace.msf ;; \
-               *_linux* ) \
+               *_linux* | *_umlinux* ) \
                        gencat --new afszcm.cat afs_trace.msf ;; \
                ppc_darwin* | i386_fbsd*) \
                        echo No gencat for ${SYS_NAME} ;; \
@@ -42,20 +39,7 @@ afszcm.cat: afs_trace.msf
                        gencat afszcm.cat afs_trace.msf ;; \
        esac
 
-${KERNELDIR}/afs:
-       mkdir -p $@
-
-ukinstall: ${UKERNELDIR}/afs afs_trace.msf AFS_component_version_number.c
-       -chmod 666 ${UKERNELDIR}/afs/*
-       ${INSTALL} *.[csh] ${UKERNELDIR}/afs
-       ${INSTALL} ${srcdir}/*.[csh] ${UKERNELDIR}/afs
-       ${INSTALL} ${srcdir}/VNOPS/*.[csh] ${UKERNELDIR}/afs
-       ${INSTALL} ${srcdir}/UKERNEL/*.[csh] ${UKERNELDIR}/afs
-
-${UKERNELDIR}/afs:
-       mkdir -p $@
-
-install:   ${DESTDIR}${includedir}/afs/afs.h  ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h
+install:   ${DESTDIR}${includedir}/afs/afs.h  ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h
        case ${SYS_NAME} in \
                pmax_ul43 | pmax_ul43a) \
                        ${INSTALL} longc_procs.h ${DESTDIR}${includedir}/afs ;; \
@@ -77,11 +61,20 @@ ${DEST}/include/afs/afs.h: afs.h
 ${DESTDIR}${includedir}/afs/afs.h: afs.h
        ${INSTALL} $? $@
 
-
 ${TOP_INCDIR}/afs/afs.h: afs.h
        ${INSTALL} $? $@
 
 
+${DEST}/include/afs/unified_afs.h: unified_afs.h
+       ${INSTALL} $? $@
+
+${DESTDIR}${includedir}/afs/unified_afs.h: unified_afs.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/unified_afs.h: unified_afs.h
+       ${INSTALL} $? $@
+
+
 ${DEST}/include/afs/osi_inode.h: ${MKAFS_OSTYPE}/osi_inode.h
        ${INSTALL} $? $@
 
@@ -125,7 +118,7 @@ ${TOP_INCDIR}/afs/nfsclient.h: nfsclient.h
        ${INSTALL} $? $@
 
 
-dest:   ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h
+dest:   ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h
        case ${SYS_NAME} in \
                pmax_ul43 | pmax_ul43a) \
                        ${INSTALL} longc_procs.h ${DEST}/include/afs ;; \