===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- OpenXM/src/ox_toolkit/Makefile.am	2004/07/02 08:19:07	1.3
+++ OpenXM/src/ox_toolkit/Makefile.am	2005/03/03 04:40:51	1.4
@@ -1,16 +1,10 @@
 # -*- mode: Makefile -*-
-## $OpenXM: OpenXM/src/ox_toolkit/Makefile.am,v 1.2 2004/06/29 04:55:05 ohara Exp $
+## $OpenXM: OpenXM/src/ox_toolkit/Makefile.am,v 1.3 2004/07/02 08:19:07 noro Exp $
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
-if USE_GMP
-GMPLIB   = -L${prefix}/lib -lgmp
-else
-GMPFAKE  = gmp_fake.c gmp_fake.h
-endif
-
 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
 
@@ -20,16 +14,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}
@@ -42,8 +36,7 @@ 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} 
-EXTRA_libox_la_SOURCES = gmp_fake.c gmp_fake.h
+                     ox_toolkit.h mysocket.h parse.h
 
 readme-ja.txt: README
 	${OXWEAVE} ja common < README > readme-ja.txt