===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v
retrieving revision 1.33
retrieving revision 1.40
diff -u -p -r1.33 -r1.40
--- OpenXM/src/kxx/Makefile.in	2004/06/25 04:25:48	1.33
+++ OpenXM/src/kxx/Makefile.in	2008/01/12 11:26:16	1.40
@@ -1,5 +1,4 @@
-##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.32 2004/06/24 11:59:22 takayama Exp $
-#
+##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.39 2006/10/08 23:49:18 takayama Exp $
 #  Depends on  all-kan96xx [source tree of kan96xx at ${Kan96xx} is required]
 #              install-gmp, install-gc, install-util
 #
@@ -34,6 +33,12 @@ CC=@CC@
 RANLIB=@RANLIB@
 LIBS=@LIBS@ 
 CFLAGS = @CFLAGS@ -g -D_BSD_SOURCE
+# University binary is no longer supported. See old configure.in (version 1.7)
+#CFLAG2 = @CFLAG2@
+#CFLAG2p = @CFLAG2p@
+CFLAG2 = 
+CFLAG2p = 
+# Or use "lipo -create ox-i386 ox-ppc -output ox"
 #STATIC_LINK_FLAG=-static
 STATIC_LINK_FLAG=
 RM=rm
@@ -59,7 +64,7 @@ configure-old : Makefile.in configure.in
 #	.error  "Run ./make-configure"
 
 .c.o:
-	${CC}  ${CFLAGS} -I${OpenXM_include} -c  $<
+	${CC}  ${CFLAGS} ${CFLAG2} -I${OpenXM_include} -c  $<
 ox.a: ${Kan96xx}/plugin/ox.a
 	/bin/rm -f ox.a
 	ln -s ${Kan96xx}/plugin/ox.a ox.a
@@ -68,11 +73,11 @@ ox_kan.h: ${Kan96xx}/plugin/ox_kan.h
 	ln -s ${Kan96xx}/plugin/ox_kan.h ox_kan.h
 
 ox: oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o
-	${CC} ${STATIC_LINK_FLAG} ${CFLAGS} oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o ox  ${LIBS}
+	${CC} ${STATIC_LINK_FLAG} ${CFLAGS} ${CFLAG2p} oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o ox  ${LIBS}
 oxmain.o: oxmain.c ox_kan.h serversm.h
 
 oxd: oxd.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o 
-	${CC}  ${STATIC_LINK_FLAG} ${CFLAGS} oxd.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o oxd  ${LIBS} 
+	${CC}  ${STATIC_LINK_FLAG} ${CFLAGS} oxd.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o -o oxd  ${LIBS} -L{OpenXM_lib} -lgc
 oxd.o: oxd.c ox_kan.h serversm.h
 xtag.o: xtag.c 
 oxd-thread: oxd-thread.o xtag.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/plugin/oxmisc.o file2.o
@@ -84,7 +89,7 @@ ox_null: oxserver00.o ox.a nullstackmachine.o file2.o 
 oxserver00.o: oxserver00.c ox_kan.h serversm.h
 
 ox_sm1: oxserver00.o sm1stackmachine.o ox.a ${Kan96xx}/Kan/kanlib.a
-	${CC}  ${STATIC_LINK_FLAG} ${CFLAGS} oxserver00.o sm1stackmachine.o -o ox_sm1  ${LIBS} ${KANLIB} -lox_pathfinder
+	${CC}  ${STATIC_LINK_FLAG} ${CFLAGS} oxserver00.o sm1stackmachine.o -o ox_sm1  ${LIBS} ${KANLIB}
 
 oxlog: oxlog.o
 	${CC}   ${STATIC_LINK_FLAG} -o oxlog oxlog.o
@@ -95,7 +100,7 @@ ox100start : ox100start.o  ${OpenXM_lib}/libox_pathfin
 ox100start.o: ox100start.c
 
 file2.o: ${Kan96xx}/plugin/file2.c  ${Kan96xx}/plugin/file2.h
-	${CC} $(CFLAGS) -DKXX=1 -I${Kan96xx}/plugin -c ${Kan96xx}/plugin/file2.c 
+	${CC} $(CFLAGS) ${CFLAG2} -DKXX=1 -I${Kan96xx}/plugin -c ${Kan96xx}/plugin/file2.c 
 
 nullstackmachine.o: nullstackmachine.c ox_kan.h
 sm1stackmachine.o: sm1stackmachine.c  ox_kan.h
@@ -114,7 +119,7 @@ testclient2 : testclient2.o ${Kan96xx}/Kan/kanlib.a ox
 testclient2.o: testclient.c ox_kan.h
 
 ox_texmacs: ox_texmacs.o ${Kan96xx}/Kan/kanlib.a
-	${CC}  ${STATIC_LINK_FLAG} ${CFLAGS} ox_texmacs.o -o ox_texmacs  ${LIBS} ${KANLIB} -lox_pathfinder
+	${CC}  ${STATIC_LINK_FLAG} ${CFLAGS} ox_texmacs.o -o ox_texmacs  ${LIBS} ${KANLIB}
 
 clean-done: 
 	-${RM} -f .configure_done
@@ -196,6 +201,7 @@ copy-kan-lib : clean-for-install
 	touch ${OpenXM_lib}/sm1/DO_NOT_EDIT_THIS_DIRECTORY._ALL_FILES_ARE_COPIED_FROM_kan96xx_Doc
 	-if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
 	  cp ${Kan96xx}/Doc/* ${OpenXM_lib}/sm1 ; \
+	  cp -r ${Kan96xx}/Doc/Resource ${OpenXM_lib}/sm1 ; \
 	  mkdir ${OpenXM_lib}/sm1/bin ; \
 	else \
 	  cp -r ${Kan96xx}/Doc/* ${OpenXM_lib}/sm1 ; \