===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- OpenXM/src/ox_toolkit/Makefile.in	2004/07/02 08:19:07	1.20
+++ OpenXM/src/ox_toolkit/Makefile.in	2005/03/03 04:40:51	1.21
@@ -88,12 +88,9 @@ am__quote = @am__quote@
 install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
-@USE_GMP_TRUE@GMPLIB = -L${prefix}/lib -lgmp
-@USE_GMP_FALSE@GMPFAKE = gmp_fake.c gmp_fake.h
-
 OXWEAVE = ${prefix}/bin/oxweave
 INCLUDES = @X_CFLAGS@ -I${prefix}/include
-OXLIBS = -L${prefix}/lib ./libox.la -lgc ${GMPLIB}
+OXLIBS = -L${prefix}/lib ./libox.la -lgc -lgmp
 XLIBS = ${X_LIBS} ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS}
 DOCUMENTS = readme-en.txt readme-ja.txt bnf-en.txt bnf-ja.txt
 
@@ -103,16 +100,16 @@ DISTCLEANFILES = .configure_done
 docdir = ${prefix}/doc/ox_toolkit
 doc_DATA = ${DOCUMENTS}
 
-include_HEADERS = gmp_fake.h ox_toolkit.h
+include_HEADERS = ox_toolkit.h
 noinst_HEADERS = mysocket.h parse.h
 noinst_PROGRAMS = bconv testclient sample1 sample2 zclient ox_Xsample
 
-bconv_SOURCES = bconv.c ox_toolkit.h gmp_fake.h
-sample1_SOURCES = sample1.c ox_toolkit.h gmp_fake.h
-sample2_SOURCES = sample2.c ox_toolkit.h gmp_fake.h
-zclient_SOURCES = zclient.c ox_toolkit.h gmp_fake.h
-testclient_SOURCES = testclient.c ox_toolkit.h gmp_fake.h
-ox_Xsample_SOURCES = ox_Xsample.c glib.c ox_toolkit.h gmp_fake.h
+bconv_SOURCES = bconv.c ox_toolkit.h
+sample1_SOURCES = sample1.c ox_toolkit.h
+sample2_SOURCES = sample2.c ox_toolkit.h
+zclient_SOURCES = zclient.c ox_toolkit.h
+testclient_SOURCES = testclient.c ox_toolkit.h
+ox_Xsample_SOURCES = ox_Xsample.c glib.c ox_toolkit.h
 
 bconv_LDADD = ${OXLIBS}
 sample1_LDADD = ${OXLIBS}
@@ -125,9 +122,8 @@ lib_LTLIBRARIES = libox.la
 libox_la_LDFLAGS = --version-info 0:0:0
 libox_la_SOURCES = ox.c cmo.c parse.c mysocket.c mathcap.c dump.c \
                      cmolen.c print.c oxf.c oxf_old.c \
-                     ox_toolkit.h mysocket.h parse.h ${GMPFAKE} 
+                     ox_toolkit.h mysocket.h parse.h
 
-EXTRA_libox_la_SOURCES = gmp_fake.c gmp_fake.h
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -135,12 +131,8 @@ CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
 libox_la_LIBADD =
-@USE_GMP_TRUE@am_libox_la_OBJECTS = ox.lo cmo.lo parse.lo mysocket.lo \
-@USE_GMP_TRUE@	mathcap.lo dump.lo cmolen.lo print.lo oxf.lo \
-@USE_GMP_TRUE@	oxf_old.lo
-@USE_GMP_FALSE@am_libox_la_OBJECTS = ox.lo cmo.lo parse.lo mysocket.lo \
-@USE_GMP_FALSE@	mathcap.lo dump.lo cmolen.lo print.lo oxf.lo \
-@USE_GMP_FALSE@	oxf_old.lo gmp_fake.lo
+am_libox_la_OBJECTS = ox.lo cmo.lo parse.lo mysocket.lo mathcap.lo \
+	dump.lo cmolen.lo print.lo oxf.lo oxf_old.lo
 libox_la_OBJECTS = $(am_libox_la_OBJECTS)
 noinst_PROGRAMS = bconv$(EXEEXT) testclient$(EXEEXT) sample1$(EXEEXT) \
 	sample2$(EXEEXT) zclient$(EXEEXT) ox_Xsample$(EXEEXT)
@@ -148,33 +140,27 @@ PROGRAMS = $(noinst_PROGRAMS)
 
 am_bconv_OBJECTS = bconv.$(OBJEXT)
 bconv_OBJECTS = $(am_bconv_OBJECTS)
-@USE_GMP_TRUE@bconv_DEPENDENCIES = ./libox.la
-@USE_GMP_FALSE@bconv_DEPENDENCIES = ./libox.la
+bconv_DEPENDENCIES = ./libox.la
 bconv_LDFLAGS =
 am_ox_Xsample_OBJECTS = ox_Xsample.$(OBJEXT) glib.$(OBJEXT)
 ox_Xsample_OBJECTS = $(am_ox_Xsample_OBJECTS)
-@USE_GMP_TRUE@ox_Xsample_DEPENDENCIES = ./libox.la
-@USE_GMP_FALSE@ox_Xsample_DEPENDENCIES = ./libox.la
+ox_Xsample_DEPENDENCIES = ./libox.la
 ox_Xsample_LDFLAGS =
 am_sample1_OBJECTS = sample1.$(OBJEXT)
 sample1_OBJECTS = $(am_sample1_OBJECTS)
-@USE_GMP_TRUE@sample1_DEPENDENCIES = ./libox.la
-@USE_GMP_FALSE@sample1_DEPENDENCIES = ./libox.la
+sample1_DEPENDENCIES = ./libox.la
 sample1_LDFLAGS =
 am_sample2_OBJECTS = sample2.$(OBJEXT)
 sample2_OBJECTS = $(am_sample2_OBJECTS)
-@USE_GMP_TRUE@sample2_DEPENDENCIES = ./libox.la
-@USE_GMP_FALSE@sample2_DEPENDENCIES = ./libox.la
+sample2_DEPENDENCIES = ./libox.la
 sample2_LDFLAGS =
 am_testclient_OBJECTS = testclient.$(OBJEXT)
 testclient_OBJECTS = $(am_testclient_OBJECTS)
-@USE_GMP_TRUE@testclient_DEPENDENCIES = ./libox.la
-@USE_GMP_FALSE@testclient_DEPENDENCIES = ./libox.la
+testclient_DEPENDENCIES = ./libox.la
 testclient_LDFLAGS =
 am_zclient_OBJECTS = zclient.$(OBJEXT)
 zclient_OBJECTS = $(am_zclient_OBJECTS)
-@USE_GMP_TRUE@zclient_DEPENDENCIES = ./libox.la
-@USE_GMP_FALSE@zclient_DEPENDENCIES = ./libox.la
+zclient_DEPENDENCIES = ./libox.la
 zclient_LDFLAGS =
 
 DEFS = @DEFS@
@@ -191,9 +177,9 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libox_la_SOURCES) $(EXTRA_libox_la_SOURCES) \
-	$(bconv_SOURCES) $(ox_Xsample_SOURCES) $(sample1_SOURCES) \
-	$(sample2_SOURCES) $(testclient_SOURCES) $(zclient_SOURCES)
+DIST_SOURCES = $(libox_la_SOURCES) $(bconv_SOURCES) \
+	$(ox_Xsample_SOURCES) $(sample1_SOURCES) $(sample2_SOURCES) \
+	$(testclient_SOURCES) $(zclient_SOURCES)
 DATA = $(doc_DATA)
 
 HEADERS = $(include_HEADERS) $(noinst_HEADERS)
@@ -202,7 +188,7 @@ DIST_COMMON = README $(include_HEADERS) $(noinst_HEADE
 	Makefile.in aclocal.m4 compile config.guess config.sub \
 	configure configure.in install-sh ltconfig ltmain.sh missing \
 	mkinstalldirs
-SOURCES = $(libox_la_SOURCES) $(EXTRA_libox_la_SOURCES) $(bconv_SOURCES) $(ox_Xsample_SOURCES) $(sample1_SOURCES) $(sample2_SOURCES) $(testclient_SOURCES) $(zclient_SOURCES)
+SOURCES = $(libox_la_SOURCES) $(bconv_SOURCES) $(ox_Xsample_SOURCES) $(sample1_SOURCES) $(sample2_SOURCES) $(testclient_SOURCES) $(zclient_SOURCES)
 
 all: all-am