===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- OpenXM/src/ox_math/Makefile.in	2000/02/14 09:35:00	1.2
+++ OpenXM/src/ox_math/Makefile.in	2000/03/15 14:16:38	1.7
@@ -1,50 +1,35 @@
 # -*- mode: Makefile -*-
-# $OpenXM: OpenXM/src/ox_math/Makefile.in,v 1.1 2000/02/08 21:14:01 ohara Exp $
+# $OpenXM: OpenXM/src/ox_math/Makefile.in,v 1.6 2000/03/13 06:27:48 ohara Exp $
 
 OpenXM_HOME=../..
 
 PREFIX    = @prefix@
 SYS       = @ml_system@
-ADDONSDIR = ${PREFIX}/mathematica/AddOns/MathLink/DevelopersKits/${SYS}/CompilerAdditions
+ADDONSDIR = /usr/local/mathematica/AddOns/MathLink/DevelopersKits/${SYS}/CompilerAdditions
 MPREP     = ${ADDONSDIR}/mprep
 
-GMPSRC    = ${OpenXM_HOME}/src/gmp
-OXTK      = ${OpenXM_HOME}/src/ox_toolkit
 LN        = @LN_S@
 CC        = @CC@
 DEFS      = -DDEBUG
-CFLAGS    = -g -O2 ${DEFS} -I${ADDONSDIR} -I${GMPSRC} -I${OXTK}
-LIBS      = @LIBS@ -L. -lox -lgmp -L${ADDONSDIR} -lML -lm
+CFLAGS    = -g -O2 ${DEFS} -I${ADDONSDIR} -I${OpenXM_HOME}/include
+LIBS      = @LIBS@ -L${OpenXM_HOME}/lib -lox -lgmp -L${ADDONSDIR} -lML -lm
+STATIC_LINK_FLAGS = @static_link_flags@
 
+
 BINARIES  = ox_math math2ox
 INSTALL   = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 
-all: libgmp.a libox.a ${BINARIES}
+all: ${BINARIES}
 
 serv1.o serv2.o mlo.o: serv2.h
 
-libgmp.a:
-	if [ ! -d ${GMPSRC} ]; then \
-		(cd ${OpenXM_HOME}/src; ${MAKE} configure-links) \
-	fi
-	if [ ! -f ${GMPSRC}/libgmp.a ]; then \
-		(cd ${GMPSRC}; ./configure; ${MAKE} libgmp.a) \
-	fi
-	${LN} ${GMPSRC}/libgmp.a .
+ox_math: serv1.o serv2.o mlo.o
+	${CC} ${CFLAGS} ${STATIC_LINK_FLAGS} -o $@ serv2.o serv1.o mlo.o ${LIBS}
 
-libox.a:
-	if [ ! -f ${OXTK}/libox.a ]; then \
-		(cd ${OXTK}; ./make-configure; ${MAKE} libox.a) \
-	fi
-	${LN} ${OXTK}/libox.a .
+math2ox: math2ox.o math2.o mlo.o serv2.o
+	${CC} ${CFLAGS} ${STATIC_LINK_FLAGS} -o $@ math2ox.o math2.o serv2.o mlo.o ${LIBS}
 
-ox_math: serv1.o serv2.o mlo.o libox.a libgmp.a
-	${CC} ${CFLAGS} -o $@ serv2.o serv1.o mlo.o ${LIBS}
-
-math2ox: math2ox.o math2.o mlo.o serv2.o libox.a libgmp.a
-	${CC} ${CFLAGS} -o $@ math2ox.o math2.o serv2.o mlo.o ${LIBS}
-
 math2.c: math2.tm
 	-rm -f $@
 	${MPREP} $? > $@
@@ -74,4 +59,8 @@ clean-for-debug: 
 clean-binary: clean-for-debug
 
 clean:
-	-rm -f *.o *~ libox.a libgmp.a math2.c ox_math math2ox
+	-rm -f *.o *~ math2.c ox_math math2ox
+
+distclean: clean
+	-rm -f .configure_done configure config.cache config.log config.status Makefile
+