===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/Makefile,v
retrieving revision 1.12
retrieving revision 1.31
diff -u -p -r1.12 -r1.31
--- OpenXM/src/OpenMath/Makefile	2000/01/17 16:53:43	1.12
+++ OpenXM/src/OpenMath/Makefile	2000/04/02 19:24:40	1.31
@@ -1,25 +1,90 @@
 #
-# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.11 2000/01/17 15:42:00 tam Exp $
+# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.30 2000/03/17 13:22:50 takayama Exp $
 
+OpenXM_HOME = ../..
+INSTALLDIR = $(OpenXM_HOME)/lib/java-support
 
 JAVADIR = /usr/local/jdk1.1.8/
 JAVABINDIR = $(JAVADIR)bin/
-LIBDIR = ../../lib/java-support
+#JAVAINCLUDEDIR = $(JAVADIR)include
+#JAVAINCLUDEDIR = /usr/local/include/kaffe
 
-TARGETS = OpenXM.jar OM2OXM.class OMproxy.class libnative.so
+JAVAC = $(JAVABINDIR)javac
+JAVAH = $(JAVABINDIR)javah
+JAR = $(JAVABINDIR)jar
 
+TAR = tar
 
-all:	configure $(TARGETS)
+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_ERROR2.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_INDETERMINATE.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_INT32.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_LIST.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_MATHCAP.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_MONOMIAL32.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_NULL.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_POLYNOMIAL_IN_ONE_VARIABLE.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_QQ.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_RATIONAL.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_RECURSIVE_POLYNOMIAL.java \
+JP/ac/kobe_u/math/tam/OpenXM/CMO_STRING.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/OpenXMconnection.java \
+JP/ac/kobe_u/math/tam/OpenXM/SM.java
+PKGTARGETS =	JP/ac/kobe_u/math/tam/OpenXM/CMO.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_BIGFLOAT.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_DATUM.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_ERROR2.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_INDETERMINATE.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_INT32.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_LIST.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_MATHCAP.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_MONOMIAL32.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_NULL.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_POLYNOMIAL_IN_ONE_VARIABLE.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_QQ.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_RATIONAL.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_RECURSIVE_POLYNOMIAL.class \
+	JP/ac/kobe_u/math/tam/OpenXM/CMO_STRING.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/OXbody.class \
+	JP/ac/kobe_u/math/tam/OpenXM/OXmessage.class \
+	JP/ac/kobe_u/math/tam/OpenXM/SM.class
 
 
+TARGETS = OM2OXM.class OMproxy.class
+
+
+all:	clean configure OpenXM.jar $(TARGETS)
+
+
 configure:
 
 
 clean:
-	find . -name '*.class' \
-		-exec echo rm -f {} \; \
-		-exec rm -f {} \;
-	-rm -f *.so *.h *.jar
+	-rm -f *.jar *.class $(PKGTARGETS)
 
 
 distclean:	clean
@@ -29,38 +94,29 @@ distclean:	clean
 
 
 install:	all
-	if ! test -d $(LIBDIR); then \
-		mkdir -p $(LIBDIR); \
+	if [ ! -d $(INSTALLDIR) ]; then \
+		mkdir -p $(INSTALLDIR); \
 	fi
-	cp `find . -name '*.class'` $(TARGETS) $(LIBDIR)
+	$(TAR) cf - $(PKGTARGETS) $(TARGETS) | \
+		(cd $(INSTALLDIR) ; $(TAR) xf -)
 
 
 install2:
 
 
 test:
-	$(JAVADIR)/bin/javac -d . -deprecation -g *.java
-	make libnative.so
+	$(JAVAC) -d . -deprecation -g *.java
 
 
 .SUFFIXES:	.java .class
 
 
 .java.class:
-	$(JAVABINDIR)javac -d . -O $<
+	$(JAVAC) -d . -O $<
 
 
-OpenXM.jar:	JP/ac/kobe_u/math/tam/OpenXM/*.java
-	@echo jar
-	@#$(JAVABINDIR)javac -d . -O JP/ac/kobe_u/math/tam/OpenXM/OpenXM.java
-	$(JAVABINDIR)javac -d . -O $?
-	-$(JAVABINDIR)jar cf OpenXM.jar `find JP/ -name '*.class'`
+OpenXM.jar:	$(PKGSRCS)
+	-$(JAVAC) -d . -O $?
+	-@#touch $@
+	-@#$(JAR) cf $@ $(PKGTARGETS)
 
-
-OMproxy.h:	OMproxy.class
-	-$(JAVABINDIR)javah -jni $*
-
-
-libnative.so:	native.c OMproxy.h
-	cc -o libnative.so native.c \
-		-shared `find $(JAVADIR)/include/ -type d | sed 's/^/-I/'`