From b745a28c47066ab2ddd9a4ad79186c996afcf382 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 2 Jul 2002 05:53:25 +0000 Subject: [PATCH] libuafs-build-juafs-everywhere-20020702 copy this crap to the other makefiles --- src/libuafs/MakefileProto.AIX.in | 20 +++++++++++++++++++- src/libuafs/MakefileProto.DARWIN.in | 16 +++++++++++++++- src/libuafs/MakefileProto.DUX.in | 22 +++++++++++++++++++--- src/libuafs/MakefileProto.FBSD.in | 19 ++++++++++++++++++- src/libuafs/MakefileProto.HPUX.in | 21 ++++++++++++++++++--- src/libuafs/MakefileProto.IRIX.in | 21 ++++++++++++++++++--- src/libuafs/MakefileProto.LINUX.in | 6 ++---- src/libuafs/MakefileProto.NBSD.in | 19 ++++++++++++++++++- src/libuafs/MakefileProto.SOLARIS.in | 21 ++++++++++++++++++--- 9 files changed, 145 insertions(+), 20 deletions(-) diff --git a/src/libuafs/MakefileProto.AIX.in b/src/libuafs/MakefileProto.AIX.in index 3596b2e..0b47c2f 100644 --- a/src/libuafs/MakefileProto.AIX.in +++ b/src/libuafs/MakefileProto.AIX.in @@ -26,6 +26,7 @@ TEST_LDFLAGS= TEST_LIBS=-lm -lpthreads LIBUAFS = libuafs.a +LIBJUAFS = libjuafs.a LIBAFSWEB = nsafs.a LIBAFSWEBKRB = nsafs.krb.a @@ -51,9 +52,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 @@ -64,7 +73,11 @@ AFSWEB: UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ - $(MAKE) $(LIBUAFS) + $(MAKE) $(LIBUAFS) LIBJUAFS_FLAGS= + +JUAFS/$(LIBJUAFS): setup_juafs + cd JUAFS; \ + $(MAKE) $(LIBJUAFS) LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS AFSWEB/$(LIBAFSWEB): setup_nsafs cd AFSWEB; \ @@ -81,6 +94,11 @@ $(LIBUAFS): $(UAFSOBJ) $(AR) $(ARFLAGS) $(LIBUAFS) $(UAFSOBJ) $(AFS)/afsl.exp $(RANLIB) libuafs.a +$(LIBJUAFS): $(JUAFSOBJ) + -$(RM) -f $(LIBJUAFS) + $(AR) $(ARFLAGS) $(LIBJUAFS) $(JUAFSOBJ) $(AFS)/afsl.exp + $(RANLIB) libjuafs.a + $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a -$(RM) -f $(LIBAFSWEB) ld -o $(LIBAFSWEB) $(LD_FLAGS) $(AFSWEBOBJ) ${DES}/libdes.a ${DESTDIR}/lib/afs/libsys.a -lm -lc diff --git a/src/libuafs/MakefileProto.DARWIN.in b/src/libuafs/MakefileProto.DARWIN.in index f267c99..075695c 100644 --- a/src/libuafs/MakefileProto.DARWIN.in +++ b/src/libuafs/MakefileProto.DARWIN.in @@ -22,6 +22,7 @@ TEST_LDFLAGS= TEST_LIBS= LIBUAFS = libuafs.a +LIBJUAFS = libjuafs.a LIBAFSWEB = nsafs.so LIBAFSWEBKRB = nsafs.krb.so @@ -44,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 @@ -57,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} diff --git a/src/libuafs/MakefileProto.DUX.in b/src/libuafs/MakefileProto.DUX.in index 07b9ef9..96f80f5 100644 --- a/src/libuafs/MakefileProto.DUX.in +++ b/src/libuafs/MakefileProto.DUX.in @@ -8,8 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - - # System specific build commands and flags DEFINES=-DKERNEL -DUKERNEL -D_NO_PROTO -DOSF KOPTS= @@ -23,6 +21,7 @@ TEST_LDFLAGS=-pthread TEST_LIBS=-lm LIBUAFS = libuafs.a +LIBJUAFS = libjuafs.a LIBAFSWEB = nsafs.so LIBAFSWEBKRB = nsafs.krb.so @@ -48,17 +47,29 @@ setup_uafs: UAFS setup_common UAFS: mkdir -p $@ +JUAFS: + 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 +setup_juafs: JUAFS setup_common + -$(RM) -f JUAFS/Makefile JUAFS/Makefile.common + ln -s ../Makefile JUAFS/Makefile + ln -s ../Makefile.common JUAFS/Makefile.common + AFSWEB: mkdir -p $@ UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ - $(MAKE) $(LIBUAFS) + $(MAKE) $(LIBUAFS) LIBJUAFS_FLAGS= + +JUAFS/$(LIBJUAFS): setup_juafs + cd JUAFS; \ + $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS AFSWEB/$(LIBAFSWEB): setup_nsafs cd AFSWEB; \ @@ -75,6 +86,11 @@ $(LIBUAFS): $(UAFSOBJ) $(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) diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in index 06ead0e..a579b29 100644 --- a/src/libuafs/MakefileProto.FBSD.in +++ b/src/libuafs/MakefileProto.FBSD.in @@ -17,6 +17,7 @@ TEST_LDFLAGS= TEST_LIBS= LIBUAFS = libuafs.a +LIBJUAFS = libjuafs.a LIBAFSWEB = nsafs.so LIBAFSWEBKRB = nsafs.krb.so @@ -39,9 +40,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 @@ -50,9 +59,13 @@ setup_nsafs: AFSWEB setup_common AFSWEB: mkdir -p $@ +JUAFS/$(LIBJUAFS): setup_juafs + cd JUAFS; \ + $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS + UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ - $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} + $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS= AFSWEB/$(LIBAFSWEB): setup_nsafs cd AFSWEB; \ @@ -68,6 +81,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) diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in index 1d31fdc..0337db8 100644 --- a/src/libuafs/MakefileProto.HPUX.in +++ b/src/libuafs/MakefileProto.HPUX.in @@ -8,8 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - - # System specific build commands and flags CC = /opt/ansic/bin/cc DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL @@ -23,6 +21,7 @@ TEST_LDFLAGS= TEST_LIBS=-lnsl -lm -lpthread -ldld -lc LIBUAFS = libuafs.a +LIBJUAFS = libjuafs.a LIBAFSWEB = nsafs.so LIBAFSWEBKRB = nsafs.krb.so @@ -45,9 +44,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 @@ -58,7 +65,11 @@ AFSWEB: UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ - $(MAKE) $(LIBUAFS) + $(MAKE) $(LIBUAFS) LIBJUAFS_FLAGS= + +JUAFS/$(LIBJUAFS): setup_juafs + cd JUAFS; \ + $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS AFSWEB/$(LIBAFSWEB): setup_nsafs cd AFSWEB; \ @@ -74,6 +85,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) diff --git a/src/libuafs/MakefileProto.IRIX.in b/src/libuafs/MakefileProto.IRIX.in index 32745ca..1e0494b 100644 --- a/src/libuafs/MakefileProto.IRIX.in +++ b/src/libuafs/MakefileProto.IRIX.in @@ -8,8 +8,6 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config - - # System specific build commands and flags CC = cc DEFINES=-D_SGI_MP_SOURCE -DKERNEL -DUKERNEL @@ -22,6 +20,7 @@ TEST_LDFLAGS=-ignore_minor TEST_LIBS=-lpthread -lm LIBUAFS = libuafs.a +LIBJUAFS = libjuafs.a LIBAFSWEB = nsafs.so LIBAFSWEBKRB = nsafs.krb.so @@ -44,9 +43,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 @@ -57,7 +64,11 @@ AFSWEB: UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ - $(MAKE) $(LIBUAFS) + $(MAKE) $(LIBUAFS) LIBJUAFS_FLAGS= + +JUAFS/$(LIBJUAFS): setup_juafs + cd JUAFS; \ + $(MAKE) $(LIBJUAFS) LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS AFSWEB/$(LIBAFSWEB): setup_nsafs cd AFSWEB; \ @@ -73,6 +84,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 -shared $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS) diff --git a/src/libuafs/MakefileProto.LINUX.in b/src/libuafs/MakefileProto.LINUX.in index 2725ec2..edc34f9 100644 --- a/src/libuafs/MakefileProto.LINUX.in +++ b/src/libuafs/MakefileProto.LINUX.in @@ -71,13 +71,11 @@ AFSWEB: UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ - export LIBJUAFS_FLAGS=; \ - $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} + $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS= JUAFS/$(LIBJUAFS): setup_juafs cd JUAFS; \ - export LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS; \ - $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} + $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS AFSWEB/$(LIBAFSWEB): setup_nsafs cd AFSWEB; \ diff --git a/src/libuafs/MakefileProto.NBSD.in b/src/libuafs/MakefileProto.NBSD.in index a71d104..7c05c10 100644 --- a/src/libuafs/MakefileProto.NBSD.in +++ b/src/libuafs/MakefileProto.NBSD.in @@ -16,6 +16,7 @@ TEST_LDFLAGS= TEST_LIBS= LIBUAFS = libuafs.a +LIBJUAFS = libjuafs.a LIBAFSWEB = nsafs.so LIBAFSWEBKRB = nsafs.krb.so @@ -38,9 +39,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 @@ -49,9 +58,13 @@ setup_nsafs: AFSWEB setup_common AFSWEB: mkdir -p $@ +JUAFS/$(LIBJUAFS): setup_juafs + cd JUAFS; \ + $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS + UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ - $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} + $(MAKE) $(LIBUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS= AFSWEB/$(LIBAFSWEB): setup_nsafs cd AFSWEB; \ @@ -67,6 +80,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) diff --git a/src/libuafs/MakefileProto.SOLARIS.in b/src/libuafs/MakefileProto.SOLARIS.in index 7ac522a..5ecc7bf 100644 --- 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,6 +19,7 @@ TEST_LDFLAGS= TEST_LIBS=-lsocket -lnsl -lthread -lm -ldl LIBUAFS = libuafs.a +LIBJUAFS = libjuafs.a LIBAFSWEB = nsafs.so LIBAFSWEBKRB = nsafs.krb.so @@ -43,9 +42,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 @@ -56,7 +63,11 @@ AFSWEB: UAFS/$(LIBUAFS): setup_uafs cd UAFS; \ - $(MAKE) $(LIBUAFS) + $(MAKE) $(LIBUAFS) LIBJUAFS_FLAGS= + +JUAFS/$(LIBJUAFS): setup_juafs + cd JUAFS; \ + $(MAKE) $(LIBJUAFS) DESTDIR=${DESTDIR} LIBJUAFS_FLAGS=-DAFS_WEB_ENHANCEMENTS AFSWEB/$(LIBAFSWEB): setup_nsafs cd AFSWEB; \ @@ -72,6 +83,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} -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS) -- 1.9.4