===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.13
diff -u -p -r1.4 -r1.13
--- OpenXM/src/ox_toolkit/Makefile.in	2000/03/08 05:46:14	1.4
+++ OpenXM/src/ox_toolkit/Makefile.in	2003/03/30 08:05:22	1.13
@@ -1,62 +1,72 @@
 # -*- mode: Makefile -*-
-# $OpenXM: OpenXM/src/ox_toolkit/Makefile.in,v 1.3 2000/03/05 14:55:18 ohara Exp $
+# $OpenXM: OpenXM/src/ox_toolkit/Makefile.in,v 1.12 2003/03/23 20:17:34 ohara Exp $
 
 OpenXM_HOME = ../..
-GMPSRC      = ${OpenXM_HOME}/src/gmp
 OXWEAVE     = ${OpenXM_HOME}/bin/oxweave
 CC          = @CC@
-CFLAGS      = -g -O2 -DDEBUG -I${GMPSRC}
-OBJS        = ox.o parse.o mysocket.o
-BINARIES    = bconv testclient sample1 sample2 
-DOCUMENTS   = readme-eg readme-jp bnf-eg bnf-jp
+DEFS        = @DEFS@
+CFLAGS      = -g -Wall -O2 ${DEFS} -I${OpenXM_HOME}/include -finline-functions
+OBJS        = ox.o cmo.o parse.o mysocket.o mathcap.o dump.o cmolen.o print.o oxf.o oxf_old.o @USE_GMP@ gmp_fake.o
+BINARIES    = bconv testclient sample1 sample2 zclient
+DOCUMENTS   = readme-en.txt readme-ja.txt bnf-en.txt bnf-ja.txt
 X11INC      = @X_CFLAGS@
 X11LIB      = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
 RANLIB      = @RANLIB@
-LIBS        = @LIBS@ -L${OpenXM_HOME}/lib -L. -lox -lgmp
+GMPLIB      = @GMPLIB@
+LIBS        = @LIBS@ -L${OpenXM_HOME}/lib libox.a ${GMPLIB}
 INSTALL_DATA= cp -f 
+OXOBJS      = ${OBJS} bconv.o testclinet.o ox_Xsample.o sample1.o sample2.o
 
-all: libox.a libgmp.a ${BINARIES} ${DOCUMENTS}
+all: libox.a ${BINARIES} ${DOCUMENTS}
 
 all2: all ox_Xsample
 
 ox.o mysocket.o: mysocket.h
-ox.o parse.o:    ox.h oxtag.h parse.h
+ox.o parse.o:    parse.h
+${OXOBJS}:       ox_toolkit.h
+gmp_fake.o:      gmp_fake.h
 
 libox.a: ${OBJS}
 	-rm -f $@
 	ar -rc $@ ${OBJS}
 	${RANLIB} $@
 
-bconv: bconv.o libox.a libgmp.a
+bconv: bconv.o libox.a
 	${CC} ${CFLAGS} -o $@ bconv.o ${LIBS}
 
-testclient: testclient.o libox.a libgmp.a
+testclient: testclient.o libox.a
 	${CC} ${CFLAGS} -o $@ testclient.o ${LIBS}
 
-sample1: sample1.o libox.a libgmp.a
+zclient: zclient.o libox.a
+	${CC} ${CFLAGS} -o $@ zclient.o ${LIBS}
+
+sample1: sample1.o libox.a
 	${CC} ${CFLAGS} -o $@ sample1.o ${LIBS}
 
-sample2: sample2.o libox.a libgmp.a
+sample2: sample2.o libox.a
 	${CC} ${CFLAGS} -o $@ sample2.o ${LIBS}
 
-ox_Xsample: ox_Xsample.o glib.c libox.a libgmp.a
+ox_Xsample: ox_Xsample.o glib.c libox.a
 	${CC} ${CFLAGS} ${X11INC} -o $@ ox_Xsample.o glib.c ${LIBS} ${X11LIB} 
 
-readme-jp: README
-	${OXWEAVE} ja common < README > readme-jp
+mctest: mctest.o libox.a
+	${CC} ${CFLAGS} -o $@ mctest.o ${LIBS}
 
-readme-eg: README
-	${OXWEAVE} en common < README > readme-eg
+readme-ja.txt: README
+	${OXWEAVE} ja common < README > readme-ja.txt
 
-bnf-jp: bnf.oxweave
-	${OXWEAVE} ja common < bnf.oxweave > bnf-jp
+readme-en.txt: README
+	${OXWEAVE} en common < README > readme-en.txt
 
-bnf-eg: bnf.oxweave
-	${OXWEAVE} en common < bnf.oxweave > bnf-eg
+bnf-ja.txt: bnf.oxweave
+	${OXWEAVE} ja common < bnf.oxweave > bnf-ja.txt
 
+bnf-en.txt: bnf.oxweave
+	${OXWEAVE} en common < bnf.oxweave > bnf-en.txt
+
 install: install-document install-binary
 
-install-binary: libox.a ox.h
+install-binary: libox.a ox_toolkit.h
 	-if [ ! -d ${OpenXM_HOME}/lib ]; then \
 		mkdir -p ${OpenXM_HOME}/lib ;\
 	fi
@@ -64,7 +74,7 @@ install-binary: libox.a ox.h
 		mkdir -p ${OpenXM_HOME}/include ;\
 	fi
 	${INSTALL_DATA} libox.a ${OpenXM_HOME}/lib
-	${INSTALL_DATA} ox.h    ${OpenXM_HOME}/include
+	${INSTALL_DATA} ox_toolkit.h ${OpenXM_HOME}/include
 
 install-for-debug:
 	@echo "No binaries are installed."
@@ -77,9 +87,9 @@ clean-document:
 	-rm -f ${DOCUMENTS}
 
 clean-binary:
-	-rm -f *.o *~ libox.a libgmp.a ${BINARIES} ox_Xsample core a.out
+	-rm -f *.o *~ libox.a ${BINARIES} ox_Xsample core a.out
 
 clean: clean-document clean-binary
 
-distclean:
-	-rm -f .configure_done configure config.cache config.log config.status Makefile
\ No newline at end of file
+distclean: clean
+	-rm -f .configure_done config.cache config.log config.status Makefile