more-uafs-support-20040417

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

diff --git a/src/libuafs/MakefileProto.DUX.in b/src/libuafs/MakefileProto.DUX.in
index df1625e..9336c35 100644 (file)
--- a/src/libuafs/MakefileProto.DUX.in
+++ b/src/libuafs/MakefileProto.DUX.in
@@ -5,39 +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
-#
-
-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@
-
-DBUG=-O
-
-include ../config/Makefile.${SYS_NAME}
+include @TOP_OBJDIR@/src/config/Makefile.config
 
 # System specific build commands and flags
 DEFINES=-DKERNEL -DUKERNEL -D_NO_PROTO -DOSF
 KOPTS=
-DBUG=
+DBG=
 OPTF=-O
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} -pthread
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} -pthread
 WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 TEST_CFLAGS=-pthread -D_NO_PROTO -D_REENTRANT -DAFS_PTHREAD_ENV -Dosf -DAFS_OSF_ENV -DOSF
@@ -45,58 +21,22 @@ TEST_LDFLAGS=-pthread
 TEST_LIBS=-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: 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)
        ranlib $(LIBUAFS)
 
+$(LIBJUAFS): $(JUAFSOBJ)
+       -$(RM) -f $(LIBJUAFS)
+       $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ)
+       ranlib $(LIBJUAFS)
+
 $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
        -$(RM) -f $(LIBAFSWEB)
        ld -all -shared -expect_unresolved "*" $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)