solaris-deal-with-gatekeeper-stupidity-20030515

[openafs.git] / src / libafs / MakefileProto.SOLARIS.in

diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in
index 497b22c..8cc86d7 100644 (file)
--- a/src/libafs/MakefileProto.SOLARIS.in
+++ b/src/libafs/MakefileProto.SOLARIS.in
@@ -16,8 +16,7 @@ AFS_OS_OBJS = \
        osi_file.o \
        osi_sleep.o \
        osi_vm.o \
-       osi_vnodeops.o \
-       xdr_int64.o
+       osi_vnodeops.o
 
 AFS_OS_NFSOBJS = \
        osi_vfsops_nfs.o
@@ -34,27 +33,27 @@ DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 KDEFS= -Dsun4c -DSUN4C_60 -DNFSCLIENT -DSYSACCT -DOLDSCSI -DVDDRV -D_KERNEL \
        -DSYSV -dn ${ARCH_DEFS}
 
-<sun4x_57 sun4x_58 sun4x_59>
+<sun4x_57 sun4x_58 sun4x_59 sunx86_57 sunx86_58 sunx86_59>
 KDEFS_32 = 
-KDEFS_64 = -xarch=v9
+KDEFS_64 = -xarch=v9 
 
 <all>
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 
 # Name of directory to hold object files and libraries.
-<all -sun4x_57 -sun4x_58 -sun4x_59>
+<all -sun4x_57 -sun4x_58 -sun4x_59 -sunx86_57 -sunx86_58 -sunx86_59>
 KOBJ = MODLOAD
-<sun4x_57 sun4x_58 sun4x_59>
+<sun4x_57 sun4x_58 sun4x_59 sunx86_57 sunx86_58 sunx86_59>
 KOBJ = MODLOAD32 MODLOAD64
 
 
 # This tells Makefile.common to use it's single directory build target.
-<all -sun4x_57 -sun4x_58 -sun4x_59>
+<all -sun4x_57 -sun4x_58 -sun4x_59 -sunx86_57 -sunx86_58 -sunx86_59>
 COMPDIRS = single_compdir
 INSTDIRS = single_instdir
 DESTDIRS = single_destdir
 
-<sun4x_57 sun4x_58 sun4x_59>
+<sun4x_57 sun4x_58 sun4x_59 sunx86_57 sunx86_58 sunx86_59>
 COMPDIRS = solaris_compdirs
 INSTDIRS = solaris_instdirs
 DESTDIRS = solaris_destdirs
@@ -86,7 +85,7 @@ setup:
 ## This is the target for a Solaris 7. Here we build both the 32 bit and
 ## the 64 bit libafs in MODLOAD32 and MODLOAD64 directories respectively
 
-<sun4x_57 sun4x_58 sun4x_59>
+<sun4x_57 sun4x_58 sun4x_59 sunx86_57 sunx86_58 sunx86_59>
 ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
        for t in ${KOBJ} ; do \
                echo Building directory: $$t ; \
@@ -105,7 +104,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
                cd ../ ;\
        done
 
-solaris_compdirs_libafs: libafs
+solaris_compdirs_libafs: depsrcs libafs
 solaris_instdirs_libafs: install_libafs
 solaris_destdirs_libafs: dest_libafs
 
@@ -122,12 +121,21 @@ INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS}
 DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS}
 DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFSNONFS}
 
+<sun4x_57 sun4x_58 sun4x_59 sunx86_57 sunx86_58 sunx86_59>
+INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/libafs${BITS}.nonfs.o
+INST_LIBAFS = ${DESTDIR}${afskerneldir}/libafs${BITS}.o
+
+DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.nonfs.o
+DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.o
+
+<all>
+
 # Without this line, gmake tries to build libafs.o
 .PHONY: libafs
 
-libafs:        $(LIBAFSNONFS)
-install_libafs:        $(INST_LIBAFSNONFS)
-dest_libafs:   $(DEST_LIBAFSNONFS)
+libafs:        $(LIBAFSNONFS) $(LIBAFS)
+install_libafs:        $(INST_LIBAFSNONFS) $(INST_LIBAFS)
+dest_libafs:   $(DEST_LIBAFSNONFS) $(DEST_LIBAFS)
 
 
 $(INST_LIBAFS): $(LIBAFS)
@@ -142,7 +150,6 @@ $(DEST_LIBAFS): $(LIBAFS)
 $(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
        ${INSTALL} -f $? $@
 
-<all>
 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
        $(RM) -f $@
        $(LD) -r -o $@ $(AFSAOBJS) ${AFSNFSOBJS}
@@ -151,34 +158,3 @@ ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
        $(RM) -f $@
        $(LD) -r -o $@  $(AFSAOBJS) ${AFSNONFSOBJS}
 
-<sun4x_57 sun4x_58 sun4x_59>
-
-libafs: ${LIBAFSNONFS}
-
-install_libafs: ${LIBAFSNONFS}
-       ${INSTALL} -f ${LIBAFSNONFS} ${DESTDIR}${afskerneldir}/libafs${BITS}.nonfs.o
-
-dest_libafs: ${LIBAFSNONFS}
-       ${INSTALL} -f ${LIBAFSNONFS} ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.nonfs.o
-
-<all>
-
-# Solaris specific objects
-osi_groups.o: $(AFS)/osi_groups.c
-       $(CRULE1)
-osi_inode.o: $(AFS)/osi_inode.c
-       $(CRULE1)
-osi_file.o: $(AFS)/osi_file.c
-       $(CRULE1)
-osi_sleep.o: $(AFS)/osi_sleep.c
-       $(CRULE1)
-osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -o osi_vfsops_nfs.o
-osi_vfsops.o: $(AFS)/osi_vfsops.c
-       $(CRULE1) -DAFS_NONFSTRANS
-osi_vm.o: $(AFS)/osi_vm.c
-       $(CRULE1)
-osi_vnodeops.o: $(AFS)/osi_vnodeops.c
-       $(CRULE1)
-xdr_int64.o: $(RX)/xdr_int64.c
-       $(CRULE1)