X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Flibuafs%2FMakefileProto.SOLARIS.in;h=14000a56913c1ae532bad67e16694838b993b0af;hp=f413019600bc5ff351c797d8fd3dadada6b211f6;hb=9dd6d3b2e878f4121928ce7275a41fd03cb16e1a;hpb=0207991adcc2aa2b417abc73469ced3586465640

diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in
index f413019..14000a5 100644
--- a/src/libuafs/MakefileProto.SOLARIS.in
+++ b/src/libuafs/MakefileProto.SOLARIS.in
@@ -5,21 +5,12 @@
 # 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
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
+DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
 WEBOPTS = -KPIC -I../nsapi -DNETSCAPE_NSAPI -DSOLARIS -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
@@ -28,58 +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: 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/$(LIBAFSWEBKRB): 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} -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
 
-
 $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) $(DES)/libdes.a
-	-rm -f $(LIBAFSWEBKRB)
+	-$(RM) -f $(LIBAFSWEBKRB)
 	${LD} -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)