libuafs-cvsignore-20030130

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

diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in
index 7ac522a..14000a5 100644 (file)
--- a/src/libuafs/MakefileProto.SOLARIS.in
+++ b/src/libuafs/MakefileProto.SOLARIS.in
@@ -8,8 +8,6 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
-
-
 # System specific build commands and flags
 DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
@@ -21,62 +19,24 @@ TEST_LDFLAGS=
 TEST_LIBS=-lsocket -lnsl -lthread -lm -ldl
 
 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: UAFS setup_common
-       -$(RM) -f UAFS/Makefile UAFS/Makefile.common
-       ln -s ../Makefile UAFS/Makefile
-       ln -s ../Makefile.common UAFS/Makefile.common
-
-UAFS:
-       mkdir -p $@
-
-setup_nsafs: AFSWEB setup_common
-       -$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
-       ln -s ../Makefile AFSWEB/Makefile
-       ln -s ../Makefile.common AFSWEB/Makefile.common
-
-AFSWEB:
-       mkdir -p $@
-
-UAFS/$(LIBUAFS): setup_uafs
-       cd UAFS; \
-       $(MAKE) $(LIBUAFS)
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEB)
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-       cd AFSWEB; \
-       $(MAKE) $(LIBAFSWEBKRB)
-
-# Below this line are targets when in the COMMON directory:
-
 $(LIBUAFS): $(UAFSOBJ)
        -$(RM) -f $(LIBUAFS)
        $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ)
 
+$(LIBJUAFS): $(JUAFSOBJ)
+       -$(RM) -f $(LIBJUAFS)
+       $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
+
 $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
        -$(RM) -f $(LIBAFSWEB)
        ${LD} -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
 
-
 $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) $(DES)/libdes.a
        -$(RM) -f $(LIBAFSWEBKRB)
        ${LD} -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)