===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/Makefile.linux,v
retrieving revision 1.8
retrieving revision 1.14
diff -u -p -r1.8 -r1.14
--- OpenXM/src/ox_math/Makefile.linux	1999/11/29 12:14:26	1.8
+++ OpenXM/src/ox_math/Makefile.linux	2000/01/21 09:33:42	1.14
@@ -1,82 +1,71 @@
-# -*- mode: Makefile; coding: euc-japan -*-
-# $OpenXM: OpenXM/src/ox_math/Makefile.linux,v 1.7 1999/11/23 02:03:14 ohara Exp $ 
+# -*- mode: Makefile -*-
+# $OpenXM: OpenXM/src/ox_math/Makefile.linux,v 1.13 2000/01/20 15:28:50 ohara Exp $ 
 
-#
 PREFIX=/usr/local
+OpenXM_HOME=../..
 
 MLINKDIR = ${PREFIX}/mathematica/AddOns/MathLink/DevelopersKits
 SYS = Linux
 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
 
-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
-mlo.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})
+	ln -s -f ${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}
-
-testclient: testclient.o libox.a
-	${CC} ${CFLAGS} -o $@ testclient.o ${LIBS}
-
-ox_math: serv1.o serv2.o mlo.o libox.a
+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
+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:  $(BINARIES)
-	install -c -m 755  $(BINARIES) ${OpenXM_HOME}/bin/
+install: install-binary install-document
 
+install-document:
+	(cd documents; ${MAKE} install-document)
+
+install-binary:
+	-if [ -x ${MPREP} ]; then \
+		${MAKE} install-binary-real ; \
+	fi
+
+install-binary-real: ${BINARIES}
+	install -c -m 755  ${BINARIES} ${OpenXM_HOME}/bin/
+	(cd lib; ${MAKE} install)
+
+install-for-debug: ${BINARIES}
+	-for i in ${BINARIES}; do \
+		ln -s -f ${OpenXM_HOME}/src/ox_math/$$i ${OpenXM_HOME}/bin ; \
+	done
+
+clean-for-debug: 
+	(cd ${OpenXM_HOME}/bin; rm -f ${BINARIES})
+
+clean-binary: clean-for-debug
+
 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