===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- OpenXM/src/kxx/Makefile.in	2000/03/11 01:18:25	1.2
+++ OpenXM/src/kxx/Makefile.in	2000/12/21 08:20:10	1.7
@@ -1,4 +1,4 @@
-##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.1 2000/02/01 09:59:43 takayama Exp $
+##  $OpenXM: OpenXM/src/kxx/Makefile.in,v 1.6 2000/09/20 01:43:34 takayama Exp $
 ## Targets :  
 ##   all  : generates ox oxlog ox_sm1 oxweave
 ##   install : copy the binaries to $(OpenXM_bin),
@@ -21,7 +21,8 @@ RANLIB=@RANLIB@
 LIBS=@LIBS@ 
 CFLAGS = -g
 DDD=-D_BSD_SOURCE
-LINKFLAG=-static
+#STATIC_LINK_FLAG=-static
+STATIC_LINK_FLAG=
 ########## end of configurations
 
 ### Set the server name in oxmain.c if you do not use the environmental
@@ -31,11 +32,18 @@ all : configure all-plugin kanlib.a ox ox_sm1  oxlog o
 
 all2 : all-plugin kanlib.a ox ox_sm1 testclient oxlog
 
-configure : Makefile.in configure.in
-	echo "You configure is older than Makefine.in and configure.in"
+configure: Makefile
+
+Makefile: Makefile.in
+	./configure
+
+# configure is added to repo for a while.
+configure-old : Makefile.in configure.in
+	echo "Your configure is older than Makefine.in and configure.in"
 	/bin/rm -f .configure_done
-	autoconf
-	.error  "Run ./make-configure"
+	./make-configure
+#	autoconf
+#	.error  "Run ./make-configure"
 
 dist : 
 	./makeDist
@@ -60,19 +68,19 @@ ox_kan.h : $(KANHOME)/plugin/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
-	$(CC) ${LINKFLAG} $(CFLAGS) ${DDD} oxmain.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o -o ox  $(LIBS) 
+	$(CC) ${STATIC_LINK_FLAG} $(CFLAGS) ${DDD} oxmain.c $(KANHOME)/plugin/mytcpio.o $(KANHOME)/plugin/oxmisc.o file2.o -o ox  $(LIBS) 
 
 ox_null : oxserver00.c ox.a nullstackmachine.o file2.o ox_kan.h
-	$(CC)  ${LINKFLAG} $(CFLAGS)  ${DDD} oxserver00.c ox.a nullstackmachine.o file2.o -o ox_null  $(LIBS) ; \
+	$(CC)  ${STATIC_LINK_FLAG} $(CFLAGS)  ${DDD} oxserver00.c ox.a nullstackmachine.o file2.o -o ox_null  $(LIBS) ; \
 
 ox_sm1 : oxserver00.c sm1stackmachine.o ox_kan.h ox.a $(KANHOME)/Kan/kanlib.a
-	$(CC)  ${LINKFLAG} $(CFLAGS)  ${DDD} oxserver00.c sm1stackmachine.o -o ox_sm1  $(LIBS) $(KANLIB)
+	$(CC)  ${STATIC_LINK_FLAG} $(CFLAGS)  ${DDD} oxserver00.c sm1stackmachine.o -o ox_sm1  $(LIBS) $(KANLIB)
 
 oxlog : oxlog.c
-	$(CC)   ${LINKFLAG} ${DDD} -o oxlog oxlog.c
+	$(CC)   ${STATIC_LINK_FLAG} ${DDD} -o oxlog oxlog.c
 
 oxweave : oxweave.c oxweaveUsage.h
-	$(CC)   ${LINKFLAG} ${DDD} -o oxweave -g oxweave.c
+	$(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
@@ -85,8 +93,8 @@ testclient : testclient.c ox.a file2.o ox_kan.h
 	$(CC) $(CFLAGS)  ${DDD} testclient.c -o testclient ox.a file2.o $(LIBS)
 
 
-#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
+#KANLIB = $(KANHOME)/Kan/kanlib.a $(OpenXM_lib)/libgmp.a $(KANHOME)/gmp/mpn/libmpn.a $(KANHOME)/gc/gc.a
+KANLIB = $(KANHOME)/Kan/kanlib.a $(OpenXM_lib)/libgmp.a $(KANHOME)/gc/gc.a
 
 ## file2 should be linked from kanlib.a