===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/Makefile,v
retrieving revision 1.15
retrieving revision 1.37
diff -u -p -r1.15 -r1.37
--- OpenXM/src/OpenMath/Makefile	2000/01/19 06:18:50	1.15
+++ OpenXM/src/OpenMath/Makefile	2000/11/28 10:06:45	1.37
@@ -1,123 +1,42 @@
 #
-# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.14 2000/01/18 07:59:19 tam Exp $
+# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.36 2000/11/27 08:15:07 ohara Exp $
 
 OpenXM_HOME = ../..
-INSTALLDIR = $(OpenXM_HOME)/lib/java-support
+INSTALLDIR = ${OpenXM_HOME}/lib/java-support
 
 #JAVADIR = /usr/local/jdk1.1.8/
-#JAVABINDIR = $(JAVADIR)bin/
-#JAVAINCLUDEDIR = $(JAVADIR)include
-JAVAINCLUDEDIR = /usr/local/include/kaffe
+#JAVABINDIR = ${JAVADIR}bin/
+#JAVAINCLUDEDIR = ${JAVADIR}include
+#JAVAINCLUDEDIR = /usr/local/include/kaffe
 
-JAVAC = $(JAVABINDIR)javac
-JAVAH = $(JAVABINDIR)javah
-JAR = $(JAVABINDIR)jar
+JAVAC = ${JAVABINDIR}javac
+JAVAH = ${JAVABINDIR}javah
+JAR = ${JAVABINDIR}jar
 
-TAR = tar
+JFLAGS = -O -g -deprecation
 
-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 \
-	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/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_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 \
-	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/OpenXM.class \
-	JP/ac/kobe_u/math/tam/OpenXM/OpenXMconnection.class \
-	JP/ac/kobe_u/math/tam/OpenXM/SM.class
+# TARGETS = OMproxy.class OM2OXM.class ORG/openxm/tam/OpenXM.class
+TARGETS = OMproxy.class
 
-TARGETS = OpenXM.jar OM2OXM.class OMproxy.class libnative.so
+.SUFFIXES: .java .class
 
+.java.class:
+	${JAVAC} ${JFLAGS} -d . $<
 
-all:	configure $(TARGETS)
+all: ${TARGETS}
 
-
 configure:
 
-
 clean:
-	-rm -f *.so *.h *.jar *.class $(PKGTARGETS)
+	-find . -name '*~' | xargs rm -f
+	-find . -name '*.class' | xargs rm -f OpenXM.jar
 
-
 distclean:	clean
-	find . -name '*~' \
-		-exec echo rm -f {} \; \
-		-exec rm -f {} \;
 
+install: all
+	-mkdir -p ${INSTALLDIR}
+	find . -name '*.class' | xargs tar cf - ${TARGETS} | \
+	(cd ${INSTALLDIR} ; tar xf -)
 
-install:	all
-	if ! test -d $(INSTALLDIR); then \
-		mkdir -p $(INSTALLDIR); \
-	fi
-	$(TAR) cf - $(PKGTARGETS) $(TARGETS) | \
-		(cd $(INSTALLDIR) ; $(TAR) xf -)
-
-
-install2:
-
-
-test:
-	$(JAVAC) -d . -deprecation -g *.java
-	make libnative.so
-
-
-.SUFFIXES:	.java .class
-
-
-.java.class:
-	$(JAVAC) -d . -O $<
-
-
-OpenXM.jar:	$(PKGSRCS)
-	$(JAVAC) -d . -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/'`
+OpenXM.jar:	all
+	find ORG -name '*.class' | xargs ${JAR} cf OpenXM.jar