===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.17
diff -u -p -r1.2 -r1.17
--- OpenXM/src/ox_toolkit/Makefile.in	2000/02/08 20:33:06	1.2
+++ OpenXM/src/ox_toolkit/Makefile.in	2004/06/21 10:15:30	1.17
@@ -1,69 +1,98 @@
 # -*- mode: Makefile -*-
-# $OpenXM: OpenXM/src/ox_toolkit/Makefile.in,v 1.1 2000/02/08 09:51:13 ohara Exp $
+# $OpenXM: OpenXM/src/ox_toolkit/Makefile.in,v 1.16 2004/02/28 23:39:38 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
+LOBJS		= ${OBJS:.o=.lo}
+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. -lox -lgmp
-INSTALL_DATA= cp -f 
-LN          = @LN_S@
+GMPLIB      = @GMPLIB@
+LIBS_PRE    = @LIBS@ -L${OpenXM_HOME}/lib ${GMPLIB}
+LIBS_POST   = -L${OpenXM_HOME}/lib -lgc
+LIBS        = ${LIBS_PRE} libox.a ${LIBS_POST}
+INSTALL     = @INSTALL@
+INSTALL_DATA= @INSTALL_DATA@
+OXOBJS      = ${OBJS} bconv.o testclinet.o ox_Xsample.o sample1.o sample2.o
+PICFLAGS    = -fpic -fPIC
 
-all: libox.a libgmp.a ${BINARIES} ${DOCUMENTS}
+.SUFFIXES: .c .lo
 
+.c.lo:
+	${CC} ${CFLAGS} ${PICFLAGS} -o $@ -c $<
+
+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
+all3: libox.so all
 
-libgmp.a:
-	test -f ${GMPSRC}/libgmp.a || (cd ${GMPSRC}; ./configure; ${MAKE})
-	-${LN} ${GMPSRC}/libgmp.a .
+libox.so:  ${LOBJS}
+	-rm -f $@
+	${CC} -shared ${CFLAGS} -o $@ ${LOBJS} ${LIBS_PRE} ${LIBS_POST}
 
+ox.o mysocket.o: mysocket.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
 
-install: install-document
+bnf-en.txt: bnf.oxweave
+	${OXWEAVE} en common < bnf.oxweave > bnf-en.txt
 
-install-binary:
-	@echo "No binaries are installed."
+install: install-document install-binary
 
+install-binary: libox.a ox_toolkit.h gmp_fake.h
+	-if [ ! -d ${OpenXM_HOME}/lib ]; then \
+		mkdir -p ${OpenXM_HOME}/lib ;\
+	fi
+	-if [ ! -d ${OpenXM_HOME}/include ]; then \
+		mkdir -p ${OpenXM_HOME}/include ;\
+	fi
+	${INSTALL_DATA} libox.a ${OpenXM_HOME}/lib
+	${INSTALL_DATA} ox_toolkit.h ${OpenXM_HOME}/include
+	${INSTALL_DATA} gmp_fake.h   ${OpenXM_HOME}/include
+
 install-for-debug:
 	@echo "No binaries are installed."
 
@@ -75,6 +104,9 @@ clean-document:
 	-rm -f ${DOCUMENTS}
 
 clean-binary:
-	-rm -f *.o *~ libox.a libgmp.a ${BINARIES} ox_Xsample core a.out
+	-rm -f *.o *.lo *~ libox.a libox.so ${BINARIES} ox_Xsample core a.out
 
 clean: clean-document clean-binary
+
+distclean: clean
+	-rm -f .configure_done config.cache config.log config.status Makefile