===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/Attic/Makefile,v
retrieving revision 1.3
retrieving revision 1.13
diff -u -p -r1.3 -r1.13
--- OpenXM/src/kxx/Attic/Makefile	1999/11/02 13:11:11	1.3
+++ OpenXM/src/kxx/Attic/Makefile	1999/12/14 06:41:03	1.13
@@ -1,19 +1,17 @@
 ######### configurations.    
-##  $OpenXM: OpenXM/src/kxx/Makefile,v 1.2 1999/10/30 02:24:26 takayama Exp $
+##  $OpenXM: OpenXM/src/kxx/Makefile,v 1.12 1999/12/13 07:55:23 takayama Exp $
 KANHOME = ../SSkan
 
 LFLAG =
-#LFLAG = -lnsl -lsocket /usr/ucblib/libucb.a
+SOLARISLFLAG = -lnsl -lsocket /usr/ucblib/libucb.a
 
-#CFLAGS = -DSOLARIS
 CFLAGS = -g
-MYOSTYPE = linux
 
 ########## end of configurations
 ### Set the server name in oxmain.c if you do not use the environmental
 ### variable LOAD_SM1_PATH.  cf. $KANHOME/lib/ox.sm1
 
-all : all-plugin kanlib.a ox ox_sm1  oxlog
+all : all-plugin kanlib.a ox ox_sm1  oxlog oxweave
 
 all2 : all-plugin kanlib.a ox ox_sm1 testclient oxlog
 
@@ -40,18 +38,36 @@ ox_kan.h :
 	ln -s $(KANHOME)/plugin/ox_kan.h ox_kan.h
 
 ox : oxmain.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o ox_kan.h
-	gcc $(CFLAGS) oxmain.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o -o ox  $(LFLAG)
+	if test `uname` = "SunOS" ; \
+	then \
+	gcc $(CFLAGS) oxmain.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o -o ox  $(SOLARISLFLAG) ; \
+	else \
+	gcc $(CFLAGS) oxmain.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o -o ox  $(LFLAG) ; \
+	fi
 
 ox_null : oxserver00.c ox.a nullstackmachine.o file2.o ox_kan.h
-	gcc $(CFLAGS) oxserver00.c ox.a nullstackmachine.o file2.o -o ox_null  $(LFLAG)
+	if test `uname` = "SunOS" ; \
+	then \
+	gcc $(CFLAGS) oxserver00.c ox.a nullstackmachine.o file2.o -o ox_null  $(SOLARISLFLAG) ; \
+	else \
+	gcc $(CFLAGS) oxserver00.c ox.a nullstackmachine.o file2.o -o ox_null  $(LFLAG) ; \
+	fi
 
 ox_sm1 : oxserver00.c sm1stackmachine.o ox_kan.h ox.a $(KANHOME)/Kan/kanlib.a
 	(cd $(KANHOME)/Kan ; make kanlib.a)
-	gcc $(CFLAGS) oxserver00.c sm1stackmachine.o -o ox_sm1  $(LFLAG) $(KANLIB)
+	if test `uname` = "SunOS" ; \
+	then \
+	gcc $(CFLAGS) oxserver00.c sm1stackmachine.o -o ox_sm1  $(SOLARISLFLAG) $(KANLIB) ; \
+	else \
+	gcc $(CFLAGS) oxserver00.c sm1stackmachine.o -o ox_sm1  $(LFLAG) $(KANLIB) ; \
+	fi
 
 oxlog : oxlog.c
 	gcc -o oxlog oxlog.c
 
+oxweave : oxweave.c oxweaveUsage.h
+	gcc -o oxweave -g oxweave.c
+
 ## file2.c file2.h is in SSkan/plugin/
 file2.o : $(KANHOME)/plugin/file2.c  $(KANHOME)/plugin/file2.h
 	gcc $(CFLAGS) -DKXX=1 -I$(KANHOME)/plugin -c $(KANHOME)/plugin/file2.c 
@@ -63,7 +79,8 @@ testclient : testclient.c ox.a file2.o ox_kan.h
 	gcc $(CFLAGS) testclient.c -o testclient ox.a file2.o $(LFLAG)
 
 
-KANLIB = $(KANHOME)/Kan/kanlib.a $(KANHOME)/gmp/libgmp.a $(KANHOME)/gmp/mpn/libmpn.a $(KANHOME)/gc/gc.a
+#KANLIB = $(KANHOME)/Kan/kanlib.a $(KANHOME)/gmp/libgmp.a $(KANHOME)/gmp/mpn/libmpn.a $(KANHOME)/gc/gc.a
+KANLIB = $(KANHOME)/Kan/kanlib.a $(KANHOME)/gmp/libgmp.a $(KANHOME)/gc/gc.a
 
 ## file2 should be linked from kanlib.a
 
@@ -75,7 +92,7 @@ testclient2 : testclient2.c  ox_kan.h $(KANHOME)/Kan/k
 
 
 clean :
-	/bin/rm -f ox testclient ox_null ox_sm1 testclient2 core *.o a.out *.dvi *.aux openxxx.log  ox_sm1 oxlog *~ 
+	/bin/rm -f ox testclient ox_null ox_sm1 testclient2 core *.o a.out *.dvi *.aux openxxx.log  ox_sm1 oxlog *~ oxweave
 
 BACKUPDIR = Old/19980112
 backup :
@@ -99,9 +116,8 @@ print :
 	a2ps $(KANHOME)/plugin/file2.c | lpr -P$(PR)
 	a2ps $(KANHOME)/plugin/file2.h | lpr -P$(PR)
 
-install :
-	/bin/rm -f ../bin/ox ../bin/ox_sm1 ../bin/oxlog
-	cp  ox ox_sm1 oxlog ../bin
+install_lib_bin :
+	/bin/rm -f $(KANHOME)/lib/bin/ox*
 	ln -f -s ../../../bin/ox $(KANHOME)/lib/bin/ox
 	ln -f -s ../../../bin/oxlog $(KANHOME)/lib/bin/oxlog
 	ln -f -s ../../../bin/ox_sm1 $(KANHOME)/lib/bin/ox_sm1
@@ -111,10 +127,21 @@ install :
 	ln -f -s ./ox_sm1 $(KANHOME)/lib/bin/ox_sm1_tigers
 	ln -f -s ./ox_sm1 $(KANHOME)/lib/bin/ox_sm1_basicCD
 
-install2 :
+install : install_lib_bin
+	/bin/rm -f ../bin/ox ../bin/ox_sm1 ../bin/oxlog ../bin/oxweave
+	cp  ox ox_sm1 oxlog oxweave ../bin
+
+install2 : install_lib_bin
+	/bin/rm -f ../bin/ox ../bin/ox_sm1 ../bin/oxlog ../bin/oxweave
 	ln -f -s  ../src/kxx/ox ../bin/ox
 	ln -f -s  ../src/kxx/ox_sm1 ../bin/ox_sm1
 	ln -f -s  ../src/kxx/oxlog ../bin/oxlog
+	ln -f -s  ../src/kxx/oxweave ../bin/oxweave
+
+
+configure:
+	/bin/rm -f ox_kan.h 
+	ln -f -s  ../SSkan/plugin/ox_kan.h ox_kan.h
 
 
 clean-binary :