Move contents of afs_osi_gcpags to per-OS files

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

diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in
index 7ebfb16..818cf58 100644 (file)
--- a/src/libafs/MakefileProto.HPUX.in
+++ b/src/libafs/MakefileProto.HPUX.in
@@ -7,11 +7,16 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 
 # OS specific object files:
 AFS_OS_OBJS = \
        osi_debug.o \
+       osi_gcpags.o \
        osi_groups.o \
        osi_inode.o \
        osi_file.o \
@@ -21,13 +26,13 @@ AFS_OS_OBJS = \
        osi_vm.o
 
 AFS_OS_NFSOBJS = \
-<ia64_hpux1123>
+<ia64_hpux1123 hp_ux1123>
        hpux_mod_nfs.modmeta.o \
 <all>
        osi_vfsops_nfs.o
 
 AFS_OS_NONFSOBJS = \
-<ia64_hpux1123>
+<ia64_hpux1123 hp_ux1123>
        hpux_mod.modmeta.o \
 <all>
        osi_vfsops.o
@@ -57,6 +62,8 @@ AFS_OS_NONFSOBJS = \
 # for 11.23, see the DDK BE/Sample_makefiles/Makefile.bld
 # for mod drivers.
 #
+# 11.23 uses new compiler, with new options. The same compiler is on pa_risc and ia64 
+#
 <hp_ux110 hp_ux102 hp_ux11i>
 KDEFS= +ES1.Xindirect_calls +XixdU +Hx0 +ESlit +ESsfc +ESssf -Wp,-H300000 -D_KERNEL -D_KERNEL_BUILD -D_UNSUPPORTED \
        -DMP +R500 -Wl,+k $(CPU_KDEFS)
@@ -76,6 +83,12 @@ KDEFS_32 =
 KDEFS_64 = +DD64
 
 <ia64_hpux1123>
+ARCH=ipf
+
+<hp_ux1123>
+ARCH=pa
+
+<ia64_hpux1123 hp_ux1123>
 
 CCOPTS_common= -Ae +DD64 +O2
 
@@ -93,11 +106,24 @@ IDENTS_ipf= -DKERNEL_DEBUGGER -DVARIABLE_UAREA -D_SYSCALL_64 -D__NO_PA_HDRS
 
 LDOPTS_ipf= +noobjdebug
 
+# Definitions which apply to PA only
+
+CCOPTS_pa= +DS2.0 +ES1.Xindirect_calls +ESlit +ESsfc +ESssf \
+       +ordering_unaware +Oentrysched +Ofastaccess +Omultiprocessor \
+       -Wp,-H300000 +Xid
+
+IDENTS_pa= -DCOMB_FLIPPER -DKGDB_ON -DLP64_TMP_NODBG -DNEW_MFCTL_W \
+       -DNEW_RDB -DPARISC -DRDB -DSPP_OBP_BOOT -DSPP_RUNWAY_ERR_ENABLED \
+       -D__NO_EM_HDRS -D__ROSEVILLE__ -D__TEMP64__ -D__hp9000s800
+
+LDOPTS_pa=
+
+
 # above from the Makefile.bld example
 
-LDOPTS= $(LDOPTS_ipf)
+LDOPTS= ${LDOPTS_${ARCH}}
 KDEFS= $(CCOPTS_common) $(IDENTS_common) $(CPU_KDEFS) 
-KDEFS_64= $(CCOPTS_ipf) $(IDENTS_ipf)
+KDEFS_64= ${CCOPTS_${ARCH}} ${IDENTS_${ARCH}}
 
 MODLINK=/opt/ddk/11.23/BE/bin/modlink
 MODMETA=/opt/ddk/11.23/BE/bin/modmeta
@@ -121,7 +147,7 @@ include Makefile.common
 
 <hp_ux11i hp_ux110 hp_ux102>
 BITS = 64 32
-<ia64_hpux1122 ia64_hpux1123>
+<ia64_hpux1122 ia64_hpux1123 hp_ux1123>
 BITS = 64
 <all>
 
@@ -144,7 +170,7 @@ setup:
        ln -fs /etc/conf/ufs ufs
 <ia64_hpux1122>
        ln -fs /etc/conf/sys ufs
-<ia64_hpux1123>
+<ia64_hpux1123 hp_ux1123>
        ln -fs /usr/include/sys h
        ln -fs /usr/include/net net
        ln -fs /usr/include/netinet netinet
@@ -190,10 +216,10 @@ hpux_destdirs_libafs: dest_libafs
 
 
 # Below this line are targets when in the static directory:
-<all -ia64_hpux1123>
+<all -ia64_hpux1123 -hp_ux1123>
 LIBAFS = libafs$(BITSUFFIX).a
 LIBAFSNONFS = libafs$(BITSUFFIX).nonfs.a
-<ia64_hpux1123>
+<ia64_hpux1123 hp_ux1123>
 LIBAFS = afs$(BITSUFFIX)_nfs
 LIBAFSNONFS =afs$(BITSUFFIX)
 <all>
@@ -206,38 +232,32 @@ DEST_LIBAFSNONFS = ${DEST}/root.client/usr/bin/${LIBAFSNONFS}
 
 
 libafs: ${LIBAFSNONFS}
-install_libafs: ${INST_LIBAFSNONFS}
-dest_libafs: ${DEST_LIBAFSNONFS}
-
-$(INST_LIBAFS): $(LIBAFS)
-       ${INSTALL} -f $? $@
 
-$(INST_LIBAFSNONFS): $(LIBAFSNONFS)
-       ${INSTALL} -f $? $@
+install_libafs: $(LIBAFSNONFS)
+       ${INSTALL} -d ${DESTDIR}${afskerneldir}
+       ${INSTALL} -m 644 $(LIBAFSNONFS) $(INST_LIBAFSNONFS)
 
-$(DEST_LIBAFS): $(LIBAFS)
-       ${INSTALL} -f $? $@
-
-$(DEST_LIBAFSNONFS): $(LIBAFSNONFS)
-       ${INSTALL} -f $? $@
+dest_libafs: $(LIBAFSNONFS)
+       ${INSTALL} -d ${DEST}/root.client/usr/bin
+       ${INSTALL} -m 644 $(LIBAFSNONFS) $(DEST_LIBAFSNONFS)
 
 ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
-<all -ia64_hpux1123>
+<all -ia64_hpux1123 -hp_ux1123>
        $(AR) cru $@ $?
        $(RANLIB) $@
-<ia64_hpux1123>
+<ia64_hpux1123 hp_ux1123>
        $(MODLINK) -o $@ $(AFSAOBJS) $(AFSNFSOBJS)
 <all>
 
 ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
-<all -ia64_hpux1123>
+<all -ia64_hpux1123 -hp_ux1123>
        $(AR) cru $@ $?
        $(RANLIB) $@
-<ia64_hpux1123>
+<ia64_hpux1123 hp_ux1123>
        $(MODLINK) -o $@ $(AFSAOBJS) $(AFSNONFSOBJS)
 <all>
 
-<ia64_hpux1123>
+<ia64_hpux1123 hp_ux1123>
 hpux_mod.modmeta.c: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/hpux_mod.modmeta
        $(MODMETA) ${IDENTS_common} ${IDENTS_ipf} \
                -DAFSLIB_NAME=${LIBAFSNONFS} \