===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.18
diff -u -p -r1.7 -r1.18
--- OpenXM/src/kxx/Makefile.in	2000/12/21 08:20:10	1.7
+++ OpenXM/src/kxx/Makefile.in	2002/11/10 12:15:48	1.18
@@ -1,6 +1,6 @@
-##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.6 2000/09/20 01:43:34 takayama Exp $
+##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.17 2002/10/20 23:05:16 takayama Exp $
 ## Targets :  
-##   all  : generates ox oxlog ox_sm1 oxweave
+##   all  : generates ox oxlog ox_sm1 
 ##   install : copy the binaries to $(OpenXM_bin),
 ##             remove symbolic link from $(OpenXM_lib)/sm1 to $(KANHOME)/Doc/*
 ##             copy $(KANHOME)/Doc/* to $(OpenXM_lib)/sm1
@@ -28,7 +28,7 @@ STATIC_LINK_FLAG=
 ### Set the server name in oxmain.c if you do not use the environmental
 ### variable LOAD_SM1_PATH.  cf. $KANHOME/lib/ox.sm1
 
-all : configure all-plugin kanlib.a ox ox_sm1  oxlog oxweave 
+all : configure all-plugin kanlib.a ox ox_sm1  oxlog 
 
 all2 : all-plugin kanlib.a ox ox_sm1 testclient oxlog
 
@@ -70,6 +70,11 @@ ox_kan.h : $(KANHOME)/plugin/ox_kan.h
 ox : oxmain.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o ox_kan.h
 	$(CC) ${STATIC_LINK_FLAG} $(CFLAGS) ${DDD} oxmain.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o -o ox  $(LIBS) 
 
+oxd : oxd.c xtag.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o ox_kan.h
+	$(CC)  ${STATIC_LINK_FLAG} $(CFLAGS) ${DDD} oxd.c xtag.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o -o oxd  $(LIBS) 
+oxd-thread : oxd-thread.c xtag.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o ox_kan.h
+	$(CC) -pthread ${STATIC_LINK_FLAG} $(CFLAGS) ${DDD} oxd-thread.c xtag.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o -o oxd-thread  $(LIBS) 
+
 ox_null : oxserver00.c ox.a nullstackmachine.o file2.o ox_kan.h
 	$(CC)  ${STATIC_LINK_FLAG} $(CFLAGS)  ${DDD} oxserver00.c ox.a nullstackmachine.o file2.o -o ox_null  $(LIBS) ; \
 
@@ -79,8 +84,6 @@ ox_sm1 : oxserver00.c sm1stackmachine.o ox_kan.h ox.a 
 oxlog : oxlog.c
 	$(CC)   ${STATIC_LINK_FLAG} ${DDD} -o oxlog oxlog.c
 
-oxweave : oxweave.c oxweaveUsage.h
-	$(CC)   ${STATIC_LINK_FLAG} ${DDD} -o oxweave -g oxweave.c
 
 ## file2.c file2.h is in SSkan/plugin/
 file2.o : $(KANHOME)/plugin/file2.c  $(KANHOME)/plugin/file2.h
@@ -106,18 +109,17 @@ 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 *~ oxweave openxm-eg.tex openxm-jp.tex .configure_done
+	-/bin/rm -f ox testclient ox_null ox_sm1 testclient2 core *.o a.out *.dvi *.aux openxxx.log  ox_sm1 oxlog *~ openxm-eg.tex openxm-jp.tex .configure_done
 
 distclean : clean clean-for-install
 	/bin/rm -f config.status config.cache config.log
 
 ## install targets.
 install-for-debug : clean-for-install install_lib_bin-for-debug
-	/bin/rm -f ../bin/ox ../bin/ox_sm1 ../bin/oxlog ../bin/oxweave
+	/bin/rm -f ../bin/ox ../bin/ox_sm1 ../bin/oxlog 
 	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
 
 install_lib_bin-for-debug :
 	ln -f -s ../src/kan96xx/Doc $(OpenXM_lib)/sm1
@@ -130,11 +132,19 @@ install_lib_bin-for-debug :
 	ln -f -s ./ox_sm1 $(OpenXM_lib)/sm1/bin/ox_sm1_phc
 	ln -f -s ./ox_sm1 $(OpenXM_lib)/sm1/bin/ox_sm1_tigers
 	ln -f -s ./ox_sm1 $(OpenXM_lib)/sm1/bin/ox_sm1_basicCD
-
 install : copy-kan-lib install_lib_bin
-	cp -f ox ox_sm1 oxlog oxweave $(OpenXM_bin)
-
-install_lib_bin : 
+	if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
+	  cp -f ox.exe ox_sm1.exe oxlog.exe $(OpenXM_bin) ; \
+	else \
+	  cp -f ox ox_sm1 oxlog $(OpenXM_bin) ; \
+	fi
+install_lib_bin:
+	if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
+	  make install_lib_bin_windows ; \
+	else \
+	  make install_lib_bin_unix ; \
+	fi
+install_lib_bin_unix : 
 	/bin/rm -f $(OpenXM_lib)/sm1/bin/ox*
 	ln -f -s ../../../bin/ox $(OpenXM_lib)/sm1/bin/ox
 	ln -f -s ../../../bin/oxlog $(OpenXM_lib)/sm1/bin/oxlog
@@ -144,19 +154,38 @@ install_lib_bin : 
 	ln -f -s ./ox_sm1 $(OpenXM_lib)/sm1/bin/ox_sm1_phc
 	ln -f -s ./ox_sm1 $(OpenXM_lib)/sm1/bin/ox_sm1_tigers
 	ln -f -s ./ox_sm1 $(OpenXM_lib)/sm1/bin/ox_sm1_basicCD
+install_lib_bin_windows : 
+	-mkdir $(OpenXM_lib)/sm1/bin
+	/bin/rm -f $(OpenXM_lib)/sm1/bin/ox*
+	cp ox.exe $(OpenXM_lib)/sm1/bin/ox.exe
+	cp oxlog.exe $(OpenXM_lib)/sm1/bin/oxlog.exe
+	cp ox_sm1.exe $(OpenXM_lib)/sm1/bin/ox_sm1.exe
+	cp ox_sm1.exe $(OpenXM_lib)/sm1/bin/ox_sm1_forAsir.exe
+	cp ox_sm1.exe $(OpenXM_lib)/sm1/bin/ox_sm1_gnuplot.exe
+	cp ox_sm1.exe $(OpenXM_lib)/sm1/bin/ox_sm1_phc.exe
+	cp ox_sm1.exe $(OpenXM_lib)/sm1/bin/ox_sm1_tigers.exe
+	cp ox_sm1.exe $(OpenXM_lib)/sm1/bin/ox_sm1_basicCD.exe
 
+
 # This target overrides the symbolic link 
 # from $(OpenXM_ROOT)/src/kan96xx/lib to $(OpenXM_lib)/sm1
 # generated in the top level Makefile
+# Don't do it: cp $(OpenXM_lib)/sm1/ox-win.sm1 $(OpenXM_lib)/sm1/ox.sm1 ; 
 copy-kan-lib : clean-for-install
 	mkdir $(OpenXM_lib)/sm1
 	touch $(OpenXM_lib)/sm1/DO_NOT_EDIT_THIS_DIRECTORY._ALL_FILES_ARE_COPIED_FROM_kan96xx_Doc
-	cp -r $(KANHOME)/Doc/* $(OpenXM_lib)/sm1
+	-if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
+	  cp $(KANHOME)/Doc/* $(OpenXM_lib)/sm1 ; \
+	  mkdir $(OpenXM_lib)/sm1/bin ; \
+	else \
+	  cp -r $(KANHOME)/Doc/* $(OpenXM_lib)/sm1 ; \
+	fi
 	-/bin/rm -rf $(OpenXM_lib)/sm1/CVS
+	-/bin/rm -f $(OpenXM_lib)/sm1/var.sm1
 	cp $(KANHOME)/Kan/var.sm1 $(OpenXM_lib)/sm1
 clean-for-install :
 	-/bin/rm -rf $(OpenXM_lib)/sm1
-	-/bin/rm -rf $(OpenXM_bin)/oxlog $(OpenXM_bin)/oxweave $(OpenXM_bin)/ox_sm1 $(OpenXM_bin)/ox   
+	-/bin/rm -rf $(OpenXM_bin)/oxlog $(OpenXM_bin)/ox_sm1 $(OpenXM_bin)/ox