===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.6
diff -u -p -r1.3 -r1.6
--- OpenXM/src/ox_toolkit/Makefile.in	2000/03/05 14:55:18	1.3
+++ OpenXM/src/ox_toolkit/Makefile.in	2000/03/08 06:26:19	1.6
@@ -1,50 +1,44 @@
 # -*- mode: Makefile -*-
-# $OpenXM: OpenXM/src/ox_toolkit/Makefile.in,v 1.2 2000/02/08 20:33:06 ohara Exp $
+# $OpenXM: OpenXM/src/ox_toolkit/Makefile.in,v 1.5 2000/03/08 06:05:20 ohara Exp $
 
 OpenXM_HOME = ../..
-GMPSRC      = ${OpenXM_HOME}/src/gmp
 OXWEAVE     = ${OpenXM_HOME}/bin/oxweave
 CC          = @CC@
-CFLAGS      = -g -O2 -DDEBUG -I${GMPSRC}
+CFLAGS      = -g -O2 -DDEBUG -I${OpenXM_HOME}/include
 OBJS        = ox.o parse.o mysocket.o
 BINARIES    = bconv testclient sample1 sample2 
 DOCUMENTS   = readme-eg readme-jp bnf-eg bnf-jp
 X11INC      = @X_CFLAGS@
 X11LIB      = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
 RANLIB      = @RANLIB@
-LIBS        = @LIBS@ -L. -lox -lgmp
+LIBS        = @LIBS@ -L${OpenXM_HOME}/lib -L. -lox -lgmp
 INSTALL_DATA= cp -f 
-LN          = @LN_S@
 
-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
 
-libgmp.a:
-	test -f ${GMPSRC}/libgmp.a || (cd ${GMPSRC}; ./configure; ${MAKE})
-	-${LN} ${GMPSRC}/libgmp.a .
-
 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
+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
@@ -62,11 +56,14 @@ bnf-eg: bnf.oxweave
 install: install-document install-binary
 
 install-binary: libox.a ox.h
-	-if [ ! -d ${OpenXM_HOME}/include/ox ]; then \
-		mkdir -p ${OpenXM_HOME}/include/ox ;\
+	-if [ ! -d ${OpenXM_HOME}/lib ]; then \
+		mkdir -p ${OpenXM_HOME}/lib ;\
 	fi
-	cp -f libox.a ${OpenXM_HOME}/lib
-	cp -f ox.h ${OpenXM_HOME}/include/ox
+	-if [ ! -d ${OpenXM_HOME}/include ]; then \
+		mkdir -p ${OpenXM_HOME}/include ;\
+	fi
+	${INSTALL_DATA} libox.a ${OpenXM_HOME}/lib
+	${INSTALL_DATA} ox.h    ${OpenXM_HOME}/include
 
 install-for-debug:
 	@echo "No binaries are installed."
@@ -79,6 +76,10 @@ 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: clean
+	-rm -f .configure_done configure config.cache config.log config.status Makefile
+