more-uafs-support-20040417

[openafs.git] / src / libuafs / MakefileProto.IRIX.in

diff --git a/src/libuafs/MakefileProto.IRIX.in b/src/libuafs/MakefileProto.IRIX.in
index 993e67a..2042a88 100644 (file)
--- a/src/libuafs/MakefileProto.IRIX.in
+++ b/src/libuafs/MakefileProto.IRIX.in
@@ -5,22 +5,13 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-# MakefileProto for Solaris systems
-#
-
-DESTDIR=@DESTDIR@
-SRCDIR=@SRCDIR@
-TOP_SRCDIR=@TOP_SRCDIR@
-SYS_NAME=@AFS_SYSNAME@
-
-include ../config/Makefile.${SYS_NAME}
-
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
+srcdir=@srcdir@
+include @TOP_OBJDIR@/src/config/Makefile.config
 
 # System specific build commands and flags
 CC = cc
-DEFINES=-D_SGI_MP_SOURCE -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+DEFINES=-D_SGI_MP_SOURCE -DKERNEL -DUKERNEL
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG}
 OPTF=-O
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
@@ -29,57 +20,24 @@ TEST_LDFLAGS=-ignore_minor
 TEST_LIBS=-lpthread -lm
 
 LIBUAFS = libuafs.a
+LIBJUAFS = libjuafs.a
 LIBAFSWEB = nsafs.so
 LIBAFSWEBKRB = nsafs.krb.so
 
 include Makefile.common
 
-setup_common:
-       -rm -f  h net netinet rpc ufs nfs  machine sys inet nsapi
-       -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/inet inet
-       -ln -s /usr/include/ufs ufs
-       -ln -s $(NS_INCL) nsapi
-
-setup_uafs: setup_common
-       set UAFS; $(MKDIR_IF_NEEDED)
-       -rm -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-setup_nsafs: setup_common
-       set AFSWEB; $(MKDIR_IF_NEEDED)
-       -rm -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
-       -rm -f $(LIBUAFS)
+       -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
 
+$(LIBJUAFS): $(JUAFSOBJ)
+       -$(RM) -f $(LIBJUAFS)
+       $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
+
 $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEB)
+       -$(RM) -f $(LIBAFSWEB)
        ld -shared $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
 
 $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) ${DES}/libdes.a
-       -rm -f $(LIBAFSWEBKRB)
+       -$(RM) -f $(LIBAFSWEBKRB)
        ld -shared $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)