===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/Makefile,v
retrieving revision 1.14
retrieving revision 1.34
diff -u -p -r1.14 -r1.34
--- OpenXM/src/OpenMath/Makefile	2000/01/18 07:59:19	1.14
+++ OpenXM/src/OpenMath/Makefile	2000/06/13 14:04:19	1.34
@@ -1,13 +1,13 @@
 #
-# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.13 2000/01/17 17:09:24 tam Exp $
+# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.33 2000/04/17 03:30:01 tam Exp $
 
-OpenXM_HOME ?= ../..
+OpenXM_HOME = ../..
 INSTALLDIR = $(OpenXM_HOME)/lib/java-support
 
 #JAVADIR = /usr/local/jdk1.1.8/
 #JAVABINDIR = $(JAVADIR)bin/
 #JAVAINCLUDEDIR = $(JAVADIR)include
-JAVAINCLUDEDIR = /usr/local/include/kaffe
+#JAVAINCLUDEDIR = /usr/local/include/kaffe
 
 JAVAC = $(JAVABINDIR)javac
 JAVAH = $(JAVABINDIR)javah
@@ -15,13 +15,13 @@ JAR = $(JAVABINDIR)jar
 
 TAR = tar
 
-PKGSRCS =	JP/ac/kobe_u/math/tam/OpenXM/CMO.java \
+PKGSRCS =	\
+	JP/ac/kobe_u/math/tam/OpenXM/CMO.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_BIGFLOAT.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_DATUM.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_DISTRIBUTED_POLYNOMIAL.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_DMS.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_DMS_GENERIC.java \
-	JP/ac/kobe_u/math/tam/OpenXM/CMO_ERROR.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_ERROR2.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_INDETERMINATE.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_INT32.java \
@@ -37,7 +37,12 @@ PKGSRCS =	JP/ac/kobe_u/math/tam/OpenXM/CMO.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_TREE.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_ZERO.java \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_ZZ.java \
+	JP/ac/kobe_u/math/tam/OpenXM/DebugInputStream.java \
+	JP/ac/kobe_u/math/tam/OpenXM/MathcapViolation.java \
+	JP/ac/kobe_u/math/tam/OpenXM/OXbody.java \
+	JP/ac/kobe_u/math/tam/OpenXM/OXmessage.java \
 	JP/ac/kobe_u/math/tam/OpenXM/OpenXM.java \
+	JP/ac/kobe_u/math/tam/OpenXM/OpenXMserver.java \
 	JP/ac/kobe_u/math/tam/OpenXM/OpenXMconnection.java \
 	JP/ac/kobe_u/math/tam/OpenXM/SM.java
 PKGTARGETS =	JP/ac/kobe_u/math/tam/OpenXM/CMO.class \
@@ -46,7 +51,6 @@ PKGTARGETS =	JP/ac/kobe_u/math/tam/OpenXM/CMO.class \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_DISTRIBUTED_POLYNOMIAL.class \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_DMS.class \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_DMS_GENERIC.class \
-	JP/ac/kobe_u/math/tam/OpenXM/CMO_ERROR.class \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_ERROR2.class \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_INDETERMINATE.class \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_INT32.class \
@@ -62,21 +66,27 @@ PKGTARGETS =	JP/ac/kobe_u/math/tam/OpenXM/CMO.class \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_TREE.class \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_ZERO.class \
 	JP/ac/kobe_u/math/tam/OpenXM/CMO_ZZ.class \
+	JP/ac/kobe_u/math/tam/OpenXM/DebugInputStream.class \
+	JP/ac/kobe_u/math/tam/OpenXM/MathcapViolation.class \
 	JP/ac/kobe_u/math/tam/OpenXM/OpenXM.class \
+	JP/ac/kobe_u/math/tam/OpenXM/OpenXMserver.class \
 	JP/ac/kobe_u/math/tam/OpenXM/OpenXMconnection.class \
+	JP/ac/kobe_u/math/tam/OpenXM/OXbody.class \
+	JP/ac/kobe_u/math/tam/OpenXM/OXmessage.class \
 	JP/ac/kobe_u/math/tam/OpenXM/SM.class
 
-TARGETS = OpenXM.jar OM2OXM.class OMproxy.class libnative.so
 
+TARGETS = OM2OXM.class OMproxy.class
 
-all:	configure $(TARGETS)
 
+all:	clean configure OpenXM.jar $(TARGETS)
 
+
 configure:
 
 
 clean:
-	-rm -f *.so *.h *.jar *.class $(PKGTARGETS)
+	-rm -f *.jar *.class $(PKGTARGETS)
 
 
 distclean:	clean
@@ -86,10 +96,10 @@ distclean:	clean
 
 
 install:	all
-	if ! test -d $(INSTALLDIR); then \
+	if [ ! -d $(INSTALLDIR) ]; then \
 		mkdir -p $(INSTALLDIR); \
 	fi
-	$(TAR) cf - $(PKGTARGETS) $(TARGETS) | \
+	$(TAR) cf - $(TARGETS) `find . -name '*.class'` | \
 		(cd $(INSTALLDIR) ; $(TAR) xf -)
 
 
@@ -98,26 +108,18 @@ install2:
 
 test:
 	$(JAVAC) -d . -deprecation -g *.java
-	make libnative.so
 
 
 .SUFFIXES:	.java .class
 
 
 .java.class:
-	$(JAVAC) -d . -O $<
+	#$(JAVAC) -d . -O $<
+	$(JAVAC) -d . -g -O $<
 
 
 OpenXM.jar:	$(PKGSRCS)
-	$(JAVAC) -d . -O $?
-	@touch $@
+	#-$(JAVAC) -d . -O $?
+	-$(JAVAC) -d . -g -O $?
+	-@#touch $@
 	-@#$(JAR) cf $@ $(PKGTARGETS)
-
-
-OMproxy.h:	OMproxy.class
-	-$(JAVAH) -jni $*
-
-
-libnative.so:	native.c OMproxy.h
-	-$(CC) -o libnative.so native.c \
-		-shared `find $(JAVAINCLUDEDIR) -type d | sed 's/^/-I/'`