===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v
retrieving revision 1.31
retrieving revision 1.41
diff -u -p -r1.31 -r1.41
--- OpenXM/src/kxx/Makefile.in	2004/06/23 23:04:10	1.31
+++ OpenXM/src/kxx/Makefile.in	2010/08/18 07:23:32	1.41
@@ -1,5 +1,4 @@
-##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.30 2004/06/23 22:49:17 takayama Exp $
-#
+##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.40 2008/01/12 11:26:16 takayama Exp $
 #  Depends on  all-kan96xx [source tree of kan96xx at ${Kan96xx} is required]
 #              install-gmp, install-gc, install-util
 #
@@ -33,7 +32,9 @@ OpenXM_include_for_debug=${OpenXM_HOME_for_debug}/incl
 CC=@CC@
 RANLIB=@RANLIB@
 LIBS=@LIBS@ 
-CFLAGS = @CFLAGS@ -g -D_BSD_SOURCE
+CFLAGS = @CFLAGS@ -g -D_BSD_SOURCE -I${OpenXM_include}
+# University binary is no longer supported. See old configure.in (version 1.7)
+# Or use "lipo -create ox-i386 ox-ppc -output ox"
 #STATIC_LINK_FLAG=-static
 STATIC_LINK_FLAG=
 RM=rm
@@ -48,7 +49,7 @@ all2 : ox ox_sm1 testclient oxlog
 configure: Makefile
 
 Makefile: Makefile.in
-	./configure
+	(rm -f .configure_done ; ./make-configure)
 
 # configure is added to repo for a while.
 configure-old : Makefile.in configure.in
@@ -58,8 +59,6 @@ configure-old : Makefile.in configure.in
 #	autoconf
 #	.error  "Run ./make-configure"
 
-.c.o:
-	${CC}  ${CFLAGS} -I${OpenXM_include} -c  $<
 ox.a: ${Kan96xx}/plugin/ox.a
 	/bin/rm -f ox.a
 	ln -s ${Kan96xx}/plugin/ox.a ox.a
@@ -72,7 +71,7 @@ ox: oxmain.o ${Kan96xx}/plugin/mytcpio.o ${Kan96xx}/pl
 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
@@ -196,6 +195,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 ; \