===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/Makefile.solaris,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- OpenXM/src/ox_math/Makefile.solaris	1999/10/29 08:06:42	1.1
+++ OpenXM/src/ox_math/Makefile.solaris	1999/12/09 22:52:49	1.6
@@ -1,76 +1,64 @@
 # -*- mode: Makefile; coding: euc-japan -*-
-# $OpenXM$ 
+# $OpenXM: OpenXM/src/ox_math/Makefile.solaris,v 1.5 1999/11/23 02:03:14 ohara Exp $ 
 
 #
 PREFIX=/usr/local
 
 MLINKDIR = ${PREFIX}/mathematica/AddOns/MathLink/DevelopersKits
 SYS = Solaris
-#SYS = Linux
 ADDONSDIR = ${MLINKDIR}/${SYS}/CompilerAdditions
 MPREP = ${ADDONSDIR}/mprep
 
-# ADDONSDIR =
-
 CC = gcc
-GMPSRC = ../kan96xx/gmp-2.0.2
-#GMPSRC = ${PREFIX}/lib
+GMPSRC = ${OpenXM_HOME}/src/gmp
 GMPINC = -I${GMPSRC}
-#GMPINC = -I${PREFIX}/include
 
-# CDEFS = -DDEBUG -DSTREAM_PIPE
 CDEFS  = -DDEBUG
-INCDIR = -I${ADDONSDIR} ${GMPINC}
+INCDIR = -I${ADDONSDIR} ${GMPINC} -I${OpenXM_HOME}/src/ox_toolkit
 LIBDIR = -L${ADDONSDIR} -L.
-CFLAGS = -O2 ${CDEFS} ${INCDIR} ${LIBDIR}
+CFLAGS = -g -O2 ${CDEFS} ${INCDIR} ${LIBDIR}
 
 SOLLIBS  = -lsocket -lnsl
 MATHLIBS = -lML  -lm
 LIBS = -lox -lgmp ${MATHLIBS} ${SOLLIBS}
 
-LIBOBJS = ox.o parse.o mysocket.o
+BINARIES = bconv testclient ox_math math2ox
 
-all: libox.a bconv testclient ox_math math2ox
+all: libgmp.a libox.a $(BINARIES)
 
-bconv.o:  ox.h oxtag.h parse.h
-parse.o:  ox.h oxtag.h parse.h
-ox.o:     ox.h oxtag.h mysocket.h
-testclient.o: ox.h oxtag.h
-serv1.o:  ox.h oxtag.h serv2.h
-serv2.o:  ox.h oxtag.h serv2.h
+serv1.o serv2.o mlo.o: serv2.h
 
 libgmp.a:
-	@if [ ! -f ${GMPSRC}/libgmp.a ]; then \
-		(cd ${GMPSRC}; ./configure; make) \
-	fi
-	cp ${GMPSRC}/libgmp.a .
+	test -f ${GMPSRC}/libgmp.a || (cd ${GMPSRC}; ./configure; ${MAKE})
+	-rm -f libgmp.a
+	ln -s ${GMPSRC}/libgmp.a .
 
-libox.a: ${LIBOBJS} libgmp.a
-	-rm -f $@
-	ar -rc $@ ${LIBOBJS}
-	ranlib $@
+libox.a:
+	-rm -f libox.a
+	(cd ../ox_toolkit; ${MAKE} libox.a)
+	ln -s ${OpenXM_HOME}/src/ox_toolkit/libox.a .
 
-bconv: bconv.o libox.a
+bconv: bconv.o libox.a libgmp.a
 	${CC} ${CFLAGS} -o $@ bconv.o ${LIBS}
 
-testclient: testclient.o libox.a
+testclient: testclient.o libox.a libgmp.a
 	${CC} ${CFLAGS} -o $@ testclient.o ${LIBS}
 
-ox_math: serv1.o serv2.o libox.a
-	${CC} ${CFLAGS} -o $@ serv2.o serv1.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 libox.a
-	${CC} ${CFLAGS} -o $@ math2ox.o math2.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}
 
-sample : sample.o libox.a
-	${CC} ${CFLAGS} -o $@ sample.o ${LIBS}
-
 math2.c: math2.tm
 	-rm -f $@
 	${MPREP} $? > $@
 
-install-openXM-bin: ox_math math2ox
-	install -c -m 755 ox_math math2ox ${OpenXM_HOME}/bin/
+install-bin:  $(BINARIES)
+	install -c -m 755  $(BINARIES) ${OpenXM_HOME}/bin/
+
+install:  $(BINARIES)
+	-ln -s $(BINARIES) ${OpenXM_HOME}/bin
 
 clean:
 	-rm -f *.o *~ libox.a libgmp.a math2.c