===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/Makefile.solaris,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- OpenXM/src/ox_math/Makefile.solaris	1999/11/23 02:03:14	1.5
+++ OpenXM/src/ox_math/Makefile.solaris	2000/01/19 06:18:50	1.8
@@ -1,81 +1,57 @@
-# -*- mode: Makefile; coding: euc-japan -*-
-# $OpenXM: OpenXM/src/ox_math/Makefile.solaris,v 1.4 1999/11/07 12:12:55 ohara Exp $ 
+# -*- mode: Makefile -*-
+# $OpenXM: OpenXM/src/ox_math/Makefile.solaris,v 1.7 1999/12/15 05:40:21 ohara Exp $ 
 
-#
 PREFIX=/usr/local
+OpenXM_HOME=../..
 
 MLINKDIR = ${PREFIX}/mathematica/AddOns/MathLink/DevelopersKits
 SYS = Solaris
 ADDONSDIR = ${MLINKDIR}/${SYS}/CompilerAdditions
 MPREP = ${ADDONSDIR}/mprep
 
-# ADDONSDIR =
-
 CC = gcc
 GMPSRC = ${OpenXM_HOME}/src/gmp
-GMPINC = -I${GMPSRC}
 
 CDEFS  = -DDEBUG
-INCDIR = -I${ADDONSDIR} ${GMPINC}
+INCDIR = -I${ADDONSDIR} -I${GMPSRC} -I${OpenXM_HOME}/src/ox_toolkit
 LIBDIR = -L${ADDONSDIR} -L.
 CFLAGS = -g -O2 ${CDEFS} ${INCDIR} ${LIBDIR}
 
-SOLLIBS  = -lsocket -lnsl
-MATHLIBS = -lML  -lm
-LIBS = -lox -lgmp ${MATHLIBS} ${SOLLIBS}
+LIBS = -lox -lgmp -lML -lm -lsocket -lnsl
 
-LIBOBJS = ox.o parse.o mysocket.o
-BINARIES = bconv testclient ox_math math2ox
+BINARIES = ox_math math2ox
 
-all: libox.a $(BINARIES)
+all: libgmp.a libox.a ${BINARIES}
 
-configure:
-	@(cd ${OpenXM_HOME}/src; ${MAKE} configure)
-	@(cd ${OpenXM_HOME}/src/gmp; ./configure; make)
+serv1.o serv2.o mlo.o: serv2.h
 
-bconv.o:      ox.h oxtag.h parse.h
-math2ox.o:    ox.h oxtag.h parse.h
-mysocket.o:   mysocket.h
-ox.o:         ox.h oxtag.h parse.h mysocket.h
-parse.o:      ox.h oxtag.h parse.h
-serv1.o:      ox.h oxtag.h serv2.h
-serv2.o:      ox.h oxtag.h parse.h serv2.h
-testclient.o: ox.h oxtag.h
-
 libgmp.a:
-	@if [ ! -f ${GMPSRC}/libgmp.a ]; then \
-		${MAKE} configure; \
-	fi
-	cp -f ${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 ${OpenXM_HOME}/src/ox_toolkit; ${MAKE} libox.a)
+	ln -s ${OpenXM_HOME}/src/ox_toolkit/libox.a .
 
-bconv: bconv.o libox.a
-	${CC} ${CFLAGS} -o $@ bconv.o ${LIBS}
+ox_math: serv1.o serv2.o mlo.o libox.a libgmp.a
+	${CC} ${CFLAGS} -o $@ serv2.o serv1.o mlo.o ${LIBS}
 
-testclient: testclient.o libox.a
-	${CC} ${CFLAGS} -o $@ testclient.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}
 
-ox_math: serv1.o serv2.o libox.a
-	${CC} ${CFLAGS} -o $@ serv2.o serv1.o ${LIBS}
-
-math2ox: math2ox.o math2.o serv2.o libox.a
-	${CC} ${CFLAGS} -o $@ math2ox.o math2.o serv2.o ${LIBS}
-
-sample : sample.o libox.a
-	${CC} ${CFLAGS} -o $@ sample.o ${LIBS}
-
 math2.c: math2.tm
 	-rm -f $@
 	${MPREP} $? > $@
 
-install-openXM-bin:  $(BINARIES)
-	install -c -m 755  $(BINARIES) ${OpenXM_HOME}/bin/
+install-bin: ${BINARIES}
+	install -c -m 755  ${BINARIES} ${OpenXM_HOME}/bin/
 
+install: ${BINARIES}
+	-for i in ${BINARIES}; do \
+		ln -s -f ../src/ox_math/$$i ${OpenXM_HOME}/bin ; \
+	done
+
 clean:
-	-rm -f *.o *~ libox.a libgmp.a math2.c
-	-rm -f bconv testclient ox_math math2ox
-	-rm -f sample
+	-rm -f *.o *~ libox.a libgmp.a math2.c ox_math math2ox