X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Flibuafs%2FMakefileProto.FBSD.in;h=35d419608f0ac7ed6b01ebe221d2fae8dd8c8d7d;hp=f16d116e96707cd1f9e51a060f66b1ca5efe817a;hb=9dd6d3b2e878f4121928ce7275a41fd03cb16e1a;hpb=b9948dd9655d8eed505039a50b1aaa83a8213f18

diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in
index f16d116..35d4196 100644
--- a/src/libuafs/MakefileProto.FBSD.in
+++ b/src/libuafs/MakefileProto.FBSD.in
@@ -1,28 +1,8 @@
 #/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */
 # 
-# MakefileProto for Solaris systems
-#
-DEST=@DEST@
-TOP_SRCDIR=@TOP_SRCDIR@
-TOP_INCDIR=@TOP_INCDIR@
-TOP_LIBDIR=@TOP_LIBDIR@
-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@
-SYS_NAME=@AFS_SYSNAME@
+include @TOP_OBJDIR@/src/config/Makefile.config
 
-include ../config/Makefile.${SYS_NAME}
 
 # System specific build commands and flags
 CC = gcc
@@ -37,57 +17,20 @@ TEST_LDFLAGS=
 TEST_LIBS=
 
 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) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEB): setup_nsafs
-cd AFSWEB; \
-	$(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
-
-AFSWEB/$(LIBAFSWEBKRB): setup_nsafs
-	cd AFSWEB; \
-	$(MAKE) $(LIBAFSWEBKRB) DESTDIR=${DESTDIR}
-
-# 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 -b $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)