X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Flibafs%2FMakefileProto.AIX.in;h=8b765c6e4e43a97dbf36d1df2fc9f2dc4386718b;hp=b95ffb1d695ddc3882ccd6a750613c982ec091ec;hb=e62e3c9b661d6dcdebe7f29ee0906f788be893b8;hpb=1c70ed1f9ce3a58147d38cb0ce5ac2c24456b9fa diff --git a/src/libafs/MakefileProto.AIX.in b/src/libafs/MakefileProto.AIX.in index b95ffb1..8b765c6 100644 --- a/src/libafs/MakefileProto.AIX.in +++ b/src/libafs/MakefileProto.AIX.in @@ -7,9 +7,25 @@ # MakefileProto for AIX systems # -DESTDIR=@DESTDIR@ -SRCDIR=@SRCDIR@ +DEST=@DEST@ +TOP_INCDIR=@TOP_INCDIR@ +TOP_LIBDIR=@TOP_LIBDIR@ TOP_SRCDIR=@TOP_SRCDIR@ +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@ +afskerneldir=@afskerneldir@ SYS_NAME=@AFS_SYSNAME@ include config/Makefile.${SYS_NAME} @@ -52,7 +68,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:${TOP_LIBDIR}/extras.exp -bI:${TOP_LIBDIR}/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 \ @@ -60,10 +76,10 @@ KDEFS = -U_IBMR2 -D_POWER -D_AIX -DNLS -D_NLS -DMSG -D__STR31__ -Daiws \ -DGETMOUNT -H8 -DAFS -DAFS_COMMON -D_VOPS -D_SUN -DKERNEL LDSTUFF= -b"binder:/usr/lib/bind glink:/usr/lib/glink.o" -bnoentry -b h:4 \ -D0 -T512 -LDFLAGS = -m -eafs_config -bexport:${DESTDIR}/lib/afs/afs.exp ${IMPORTS} \ +LDFLAGS = -m -eafs_config -bexport:${TOP_LIBDIR}/afs.exp ${IMPORTS} \ -lsys -lcsys -CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(KDEFS) $(KOPTS) ${DBUG} +CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(KDEFS) $(KOPTS) ${DBUG} # Name of directory to hold object files and libraries. KOBJ = MODLOAD @@ -71,26 +87,24 @@ KOBJ = MODLOAD # This tells Makefile.common to use it's single directory build target. COMPDIRS = single_compdir INSTDIRS = single_instdir +DESTDIRS = single_destdir include Makefile.common setup: -mkdir $(KOBJ) - -rm $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config - ln -s ../Makefile $(KOBJ)/Makefile - ln -s ../Makefile.common $(KOBJ)/Makefile.common - ln -s ../config $(KOBJ)/config - -rm -f h net netinet rpc ufs nfs machine sys - ln -s /usr/include/sys h - ln -s /usr/include/net net - ln -s /usr/include/netinet netinet - ln -s /usr/include/rpc rpc - ln -s /usr/include/sys sys - ln -s /usr/include/nfs nfs - ln -s /usr/include/jfs ufs - - - + -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config + ln -fs ../Makefile $(KOBJ)/Makefile + ln -fs ../Makefile.common $(KOBJ)/Makefile.common + ln -fs ../config $(KOBJ)/config + -$(RM) -f h net netinet rpc ufs nfs machine sys + ln -fs /usr/include/sys h + ln -fs /usr/include/net net + ln -fs /usr/include/netinet netinet + ln -fs /usr/include/rpc rpc + ln -fs /usr/include/sys sys + ln -fs /usr/include/nfs nfs + ln -fs /usr/include/jfs ufs # Standard AFS->NFS translator support is removed in AFS 3.5 in favor of @@ -99,12 +113,14 @@ setup: # later 4.1.x (if they are ever made) and AIX 4.2.1 (and later AIX 4.2.x if # they are ever made. AIX 4.3 also uses the iauth translator. -CLIENTDIR = $(DESTDIR)root.client/usr/vice/etc/dkload LIBAFSIAUTH = afs.ext.iauth LIBAFS = afs.ext -DEST_LIBAFSIAUTH = $(CLIENTDIR)/$(LIBAFSIAUTH) -DEST_LIBAFS = $(CLIENTDIR)/$(LIBAFS) +DEST_LIBAFSIAUTH = $(DEST)/root.client/usr/vice/etc/dkload/$(LIBAFSIAUTH) +DEST_LIBAFS = $(DEST)/root.client/usr/vice/etc/dkload/$(LIBAFS) + +INST_LIBAFSIAUTH = ${DESTDIR}${afskerneldir}/$(LIBAFSIAUTH) +INST_LIBAFS = ${DESTDIR}${afskerneldir}/$(LIBAFS) $(DEST_LIBAFS): $(LIBAFS) $(INSTALL) -f $? $@ @@ -116,64 +132,74 @@ $(DEST_LIBAFSIAUTH): $(LIBAFSIAUTH) -${STRIP} $@ $(INSTALL) -f $?.map $@.map +$(INST_LIBAFS): $(LIBAFS) + $(INSTALL) -f $? $@ + -${STRIP} $@ + $(INSTALL) -f $?.map $@.map + +$(INST_LIBAFSIAUTH): $(LIBAFSIAUTH) + $(INSTALL) -f $? $@ + -${STRIP} $@ + $(INSTALL) -f $?.map $@.map $(LIBAFSIAUTH): $(AFSAOBJS) $(AFSIAUTHOBJS) - ${LD} ${LDSTUFF} -bloadmap:afs.ext.iauth.loadmap \ + ${LD} ${LDSTUFF} -bloadmap:afs.ext.iauth.loadmap \ -bmap:afs.ext.iauth.map -o afs.ext.iauth \ ${AFSAOBJS} ${AFSIAUTHOBJS} ${LIBS} ${LDFLAGS} $(LIBAFS): $(AFSAOBJS) $(AFSNOIAUTHOBJS) - ${LD} ${LDSTUFF} -bloadmap:afs.ext.loadmap \ + ${LD} ${LDSTUFF} -bloadmap:afs.ext.loadmap \ -bmap:afs.ext.map -o afs.ext \ ${AFSAOBJS} $(AFSNOIAUTHOBJS) ${LIBS} ${LDFLAGS} libafs: $(LIBAFS) $(LIBAFSIAUTH) -install_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSIAUTH) +install_libafs: $(INST_LIBAFS) $(INST_LIBAFSIAUTH) +dest_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSIAUTH) # Object build rules: # Common objects xdr.o: $(RX)/xdr.c - $(CRULE1); + $(CRULE1) xdr_int64.o: $(RX)/xdr_int64.c - $(CRULE1); + $(CRULE1) xdr_array.o: $(RX)/xdr_array.c - $(CRULE1); + $(CRULE1) osi_assem.o: ${AFS}/osi_assem.s ${AS} -o osi_assem.o ${AFS}/osi_assem.s osi_config.o: $(AFS)/osi_config.c - $(CRULE1); + $(CRULE1) osi_groups.o: $(AFS)/osi_groups.c - $(CRULE1); + $(CRULE1) osi_file.o: $(AFS)/osi_file.c - $(CRULE1); + $(CRULE1) osi_inode.o: $(AFS)/osi_inode.c - $(CRULE1); + $(CRULE1) osi_misc.o: $(AFS)/osi_misc.c - $(CRULE1); + $(CRULE1) osi_sleep.o: $(AFS)/osi_sleep.c - $(CRULE1); + $(CRULE1) osi_timeout.o: $(AFS)/osi_timeout.c - $(CRULE1); + $(CRULE1) osi_vfsops.o: $(AFS)/osi_vfsops.c - $(CRULE1); + $(CRULE1) osi_vm.o: $(AFS)/osi_vm.c - $(CRULE1); + $(CRULE1) osi_vnodeops.o: $(AFS)/osi_vnodeops.c - $(CRULE1); + $(CRULE1) # Build rules for iauth objects. afs_call_iauth.o: $(AFS)/afs_call.c - $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_call_iauth.o; + $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_call_iauth.o afs_nfsclnt_iauth.o: $(AFS)/afs_nfsclnt.c - $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_nfsclnt_iauth.o; + $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_nfsclnt_iauth.o afs_pioctl_iauth.o: $(AFS)/afs_pioctl.c - $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_pioctl_iauth.o; + $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o afs_pioctl_iauth.o osi_vfsops_iauth.o: $(AFS)/osi_vfsops.c - $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vfsops_iauth.o; + $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vfsops_iauth.o osi_vnodeops_iauth.o: $(AFS)/osi_vnodeops.c - $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vnodeops_iauth.o; + $(CRULE1) -DAFS_NONFSTRANS -DAFS_AIX_IAUTH_ENV -o osi_vnodeops_iauth.o