===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/Makefile,v
retrieving revision 1.14
retrieving revision 1.22
diff -u -p -r1.14 -r1.22
--- OpenXM/src/OpenMath/Makefile	2000/01/18 07:59:19	1.14
+++ OpenXM/src/OpenMath/Makefile	2000/02/21 03:48:20	1.22
@@ -1,7 +1,7 @@
 #
-# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.13 2000/01/17 17:09:24 tam Exp $
+# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.21 2000/02/07 10:09:52 tam Exp $
 
-OpenXM_HOME ?= ../..
+OpenXM_HOME = ../..
 INSTALLDIR = $(OpenXM_HOME)/lib/java-support
 
 #JAVADIR = /usr/local/jdk1.1.8/
@@ -37,6 +37,8 @@ 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/OpenXM.java \
 	JP/ac/kobe_u/math/tam/OpenXM/OpenXMconnection.java \
 	JP/ac/kobe_u/math/tam/OpenXM/SM.java
@@ -62,21 +64,23 @@ 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/OpenXMconnection.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:	configure OpenXM.jar $(TARGETS)
 
 
 configure:
 
 
 clean:
-	-rm -f *.so *.h *.jar *.class $(PKGTARGETS)
+	-rm -f *.jar *.class $(PKGTARGETS)
 
 
 distclean:	clean
@@ -86,7 +90,7 @@ distclean:	clean
 
 
 install:	all
-	if ! test -d $(INSTALLDIR); then \
+	if [ ! -d $(INSTALLDIR) ]; then \
 		mkdir -p $(INSTALLDIR); \
 	fi
 	$(TAR) cf - $(PKGTARGETS) $(TARGETS) | \
@@ -98,7 +102,6 @@ install2:
 
 test:
 	$(JAVAC) -d . -deprecation -g *.java
-	make libnative.so
 
 
 .SUFFIXES:	.java .class
@@ -110,14 +113,5 @@ test:
 
 OpenXM.jar:	$(PKGSRCS)
 	$(JAVAC) -d . -O $?
-	@touch $@
+	@#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/'`