X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Flibuafs%2FMakefileProto.DARWIN.in;h=bca384630ef98daac2e522cbc5aee46046dc89c1;hp=eaba8dc18c955c4225071a68bb4d4605a1ebb564;hb=ab09e39174ba271534398960a7ef494e3af52acb;hpb=635df30c0f8113daeaeceb856bcaaf0b8ea3d9b5

diff --git a/src/libuafs/MakefileProto.DARWIN.in b/src/libuafs/MakefileProto.DARWIN.in
index eaba8dc..bca3846 100644
--- a/src/libuafs/MakefileProto.DARWIN.in
+++ b/src/libuafs/MakefileProto.DARWIN.in
@@ -5,21 +5,15 @@
 # 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
-#
+srcdir=@srcdir@
+include @TOP_OBJDIR@/src/config/Makefile.config
 
-DESTDIR=@DESTDIR@
-SRCDIR=@SRCDIR@
-TOP_SRCDIR=@TOP_SRCDIR@
-SYS_NAME=@AFS_SYSNAME@
-
-include ../config/Makefile.${SYS_NAME}
 
 # System specific build commands and flags
 CC = cc
-DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
+DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 KOPTS=
-CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} $(XCFLAGS)
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} $(XCFLAGS)
 OPTF=-O
 # WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
@@ -28,6 +22,7 @@ TEST_LDFLAGS=
 TEST_LIBS=
 
 LIBUAFS = libuafs.a
+LIBJUAFS = libjuafs.a
 LIBAFSWEB = nsafs.so
 LIBAFSWEBKRB = nsafs.krb.so
 
@@ -50,9 +45,17 @@ setup_uafs: UAFS setup_common
 	ln -s ../Makefile UAFS/Makefile
 	ln -s ../Makefile.common UAFS/Makefile.common
 
+setup_juafs: JUAFS setup_common
+	-$(RM) -f JUAFS/Makefile JUAFS/Makefile.common
+	ln -s ../Makefile JUAFS/Makefile
+	ln -s ../Makefile.common JUAFS/Makefile.common
+
 UAFS:
 	mkdir -p $@
 
+JUAFS:
+	mkdir -p $@
+
 setup_nsafs: AFSWEB setup_common
 	-$(RM) -f AFSWEB/Makefile AFSWEB/Makefile.common
 	ln -s ../Makefile AFSWEB/Makefile
@@ -63,9 +66,14 @@ AFSWEB:
 
 UAFS/$(LIBUAFS): setup_uafs
 	cd UAFS; \
-	$(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR}; \
+	$(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=; \
 	ranlib $(LIBUAFS)
 
+JUAFS/$(LIBJUAFS): setup_juafs
+	cd JUAFS; \
+	$(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS; \
+	ranlib $(LIBJUAFS)
+
 AFSWEB/$(LIBAFSWEB): setup_nsafs
 	cd AFSWEB; \
 	$(MAKE) $(LIBAFSWEB) DESTDIR=${DESTDIR}
@@ -80,6 +88,10 @@ $(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)