=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- OpenXM/src/ox_toolkit/Makefile.in 2004/06/28 12:39:11 1.18 +++ OpenXM/src/ox_toolkit/Makefile.in 2004/06/29 04:55:05 1.19 @@ -93,7 +93,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies 1.5 OXWEAVE = ${prefix}/bin/oxweave INCLUDES = @X_CFLAGS@ -I${prefix}/include -OXLIBS = -L${prefix}/lib -lgc -lox ${GMPLIB} +OXLIBS = -L${prefix}/lib -lgc ./libox.la ${GMPLIB} XLIBS = ${X_LIBS} ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS} DOCUMENTS = readme-en.txt readme-ja.txt bnf-en.txt bnf-ja.txt @@ -148,33 +148,33 @@ PROGRAMS = $(noinst_PROGRAMS) am_bconv_OBJECTS = bconv.$(OBJEXT) bconv_OBJECTS = $(am_bconv_OBJECTS) -@USE_GMP_TRUE@bconv_DEPENDENCIES = -@USE_GMP_FALSE@bconv_DEPENDENCIES = +@USE_GMP_TRUE@bconv_DEPENDENCIES = ./libox.la +@USE_GMP_FALSE@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 = -@USE_GMP_FALSE@ox_Xsample_DEPENDENCIES = +@USE_GMP_TRUE@ox_Xsample_DEPENDENCIES = ./libox.la +@USE_GMP_FALSE@ox_Xsample_DEPENDENCIES = ./libox.la ox_Xsample_LDFLAGS = am_sample1_OBJECTS = sample1.$(OBJEXT) sample1_OBJECTS = $(am_sample1_OBJECTS) -@USE_GMP_TRUE@sample1_DEPENDENCIES = -@USE_GMP_FALSE@sample1_DEPENDENCIES = +@USE_GMP_TRUE@sample1_DEPENDENCIES = ./libox.la +@USE_GMP_FALSE@sample1_DEPENDENCIES = ./libox.la sample1_LDFLAGS = am_sample2_OBJECTS = sample2.$(OBJEXT) sample2_OBJECTS = $(am_sample2_OBJECTS) -@USE_GMP_TRUE@sample2_DEPENDENCIES = -@USE_GMP_FALSE@sample2_DEPENDENCIES = +@USE_GMP_TRUE@sample2_DEPENDENCIES = ./libox.la +@USE_GMP_FALSE@sample2_DEPENDENCIES = ./libox.la sample2_LDFLAGS = am_testclient_OBJECTS = testclient.$(OBJEXT) testclient_OBJECTS = $(am_testclient_OBJECTS) -@USE_GMP_TRUE@testclient_DEPENDENCIES = -@USE_GMP_FALSE@testclient_DEPENDENCIES = +@USE_GMP_TRUE@testclient_DEPENDENCIES = ./libox.la +@USE_GMP_FALSE@testclient_DEPENDENCIES = ./libox.la testclient_LDFLAGS = am_zclient_OBJECTS = zclient.$(OBJEXT) zclient_OBJECTS = $(am_zclient_OBJECTS) -@USE_GMP_TRUE@zclient_DEPENDENCIES = -@USE_GMP_FALSE@zclient_DEPENDENCIES = +@USE_GMP_TRUE@zclient_DEPENDENCIES = ./libox.la +@USE_GMP_FALSE@zclient_DEPENDENCIES = ./libox.la zclient_LDFLAGS = DEFS = @DEFS@