===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/Makefile,v
retrieving revision 1.7
retrieving revision 1.35
diff -u -p -r1.7 -r1.35
--- OpenXM/src/OpenMath/Makefile	2000/01/13 12:35:56	1.7
+++ OpenXM/src/OpenMath/Makefile	2000/09/13 06:44:55	1.35
@@ -1,19 +1,90 @@
 #
-# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.6 1999/12/09 00:32:36 tam Exp $
+# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.34 2000/06/13 14:04:19 tam Exp $
 
+OpenXM_HOME = ../..
+INSTALLDIR = $(OpenXM_HOME)/lib/java-support
 
-JAVADIR = /usr/local/jdk1.1.8
-LIBDIR = ../../lib/java-support
+#JAVADIR = /usr/local/jdk1.1.8/
+#JAVABINDIR = $(JAVADIR)bin/
+#JAVAINCLUDEDIR = $(JAVADIR)include
+#JAVAINCLUDEDIR = /usr/local/include/kaffe
 
+JAVAC = $(JAVABINDIR)javac
+JAVAH = $(JAVABINDIR)javah
+JAR = $(JAVABINDIR)jar
 
-all:	install
+TAR = tar
 
+PKGSRCS =	\
+	ORG/openxm/tam/CMO.java \
+	ORG/openxm/tam/CMO_BIGFLOAT.java \
+	ORG/openxm/tam/CMO_DATUM.java \
+	ORG/openxm/tam/CMO_DISTRIBUTED_POLYNOMIAL.java \
+	ORG/openxm/tam/CMO_DMS.java \
+	ORG/openxm/tam/CMO_DMS_GENERIC.java \
+	ORG/openxm/tam/CMO_ERROR2.java \
+	ORG/openxm/tam/CMO_INDETERMINATE.java \
+	ORG/openxm/tam/CMO_INT32.java \
+	ORG/openxm/tam/CMO_LIST.java \
+	ORG/openxm/tam/CMO_MATHCAP.java \
+	ORG/openxm/tam/CMO_MONOMIAL32.java \
+	ORG/openxm/tam/CMO_NULL.java \
+	ORG/openxm/tam/CMO_POLYNOMIAL_IN_ONE_VARIABLE.java \
+	ORG/openxm/tam/CMO_QQ.java \
+	ORG/openxm/tam/CMO_RATIONAL.java \
+	ORG/openxm/tam/CMO_RECURSIVE_POLYNOMIAL.java \
+	ORG/openxm/tam/CMO_STRING.java \
+	ORG/openxm/tam/CMO_TREE.java \
+	ORG/openxm/tam/CMO_ZERO.java \
+	ORG/openxm/tam/CMO_ZZ.java \
+	ORG/openxm/tam/MathcapViolation.java \
+	ORG/openxm/tam/OXbody.java \
+	ORG/openxm/tam/OXmessage.java \
+	ORG/openxm/tam/OpenXM.java \
+	ORG/openxm/tam/OpenXMserver.java \
+	ORG/openxm/tam/OpenXMstream.java \
+	ORG/openxm/tam/SM.java
+PKGTARGETS =	ORG/openxm/tam/CMO.class \
+	ORG/openxm/tam/CMO_BIGFLOAT.class \
+	ORG/openxm/tam/CMO_DATUM.class \
+	ORG/openxm/tam/CMO_DISTRIBUTED_POLYNOMIAL.class \
+	ORG/openxm/tam/CMO_DMS.class \
+	ORG/openxm/tam/CMO_DMS_GENERIC.class \
+	ORG/openxm/tam/CMO_ERROR2.class \
+	ORG/openxm/tam/CMO_INDETERMINATE.class \
+	ORG/openxm/tam/CMO_INT32.class \
+	ORG/openxm/tam/CMO_LIST.class \
+	ORG/openxm/tam/CMO_MATHCAP.class \
+	ORG/openxm/tam/CMO_MONOMIAL32.class \
+	ORG/openxm/tam/CMO_NULL.class \
+	ORG/openxm/tam/CMO_POLYNOMIAL_IN_ONE_VARIABLE.class \
+	ORG/openxm/tam/CMO_QQ.class \
+	ORG/openxm/tam/CMO_RATIONAL.class \
+	ORG/openxm/tam/CMO_RECURSIVE_POLYNOMIAL.class \
+	ORG/openxm/tam/CMO_STRING.class \
+	ORG/openxm/tam/CMO_TREE.class \
+	ORG/openxm/tam/CMO_ZERO.class \
+	ORG/openxm/tam/CMO_ZZ.class \
+	ORG/openxm/tam/MathcapViolation.class \
+	ORG/openxm/tam/OpenXM.class \
+	ORG/openxm/tam/OpenXMserver.class \
+	ORG/openxm/tam/OpenXMstream.class \
+	ORG/openxm/tam/OXbody.class \
+	ORG/openxm/tam/OXmessage.class \
+	ORG/openxm/tam/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
@@ -22,35 +93,31 @@ distclean:	clean
 		-exec rm -f {} \;
 
 
-test:
-	$(JAVADIR)/bin/javac -d . -deprecation -g *.java
-	make libnative.so
-
-
-install:	OpenXM.jar OM2OXM.class OMproxy.class libnative.so
-	if ! test -d $(LIBDIR); then \
-		mkdir -p $(LIBDIR); \
+install:	all
+	if [ ! -d $(INSTALLDIR) ]; then \
+		mkdir -p $(INSTALLDIR); \
 	fi
-	cp ${.ALLSRC} $(LIBDIR)
+	$(TAR) cf - $(TARGETS) `find . -name '*.class'` | \
+		(cd $(INSTALLDIR) ; $(TAR) xf -)
 
 
-.SUFFIXES:	.java .class
+install2:
 
 
-.java.class :
-	$(JAVADIR)/bin/javac -d . -O ${.IMPSRC}
+test:
+	$(JAVAC) -d . -deprecation -g *.java
 
 
-OpenXM.jar:	JP/ac/kobe_u/math/tam/OpenXM/{OpenXM,*}.class
-	@$(JAVADIR)/bin/javac -d . -O JP/ac/kobe_u/math/tam/OpenXM/OpenXM.java
-	@#$(JAVADIR)/bin/javac -d . -O ${.OODATE}
-	$(JAVADIR)/bin/jar cf OpenXM.jar `find JP/ -name '*.class'`
+.SUFFIXES:	.java .class
 
 
-OMproxy.h:	OMproxy.class
-	$(JAVADIR)/bin/javah -jni ${.PREFIX}
+.java.class:
+	#$(JAVAC) -d . -O $<
+	$(JAVAC) -d . -g -O $<
 
 
-libnative.so:	native.c OMproxy.h
-	cc -o libnative.so native.c \
-		-shared `find $(JAVADIR)/include/ -type d | sed 's/^/-I/'`
+OpenXM.jar:	$(PKGSRCS)
+	#-$(JAVAC) -d . -O $?
+	-$(JAVAC) -d . -g -O $?
+	-@#touch $@
+	-@#$(JAR) cf $@ $(PKGTARGETS)