===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- OpenXM/src/OpenMath/Makefile	2000/01/17 17:09:24	1.13
+++ OpenXM/src/OpenMath/Makefile	2000/01/18 07:59:19	1.14
@@ -1,11 +1,71 @@
 #
-# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.12 2000/01/17 16:53:43 tam Exp $
+# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.13 2000/01/17 17:09:24 tam Exp $
 
+OpenXM_HOME ?= ../..
+INSTALLDIR = $(OpenXM_HOME)/lib/java-support
 
-JAVADIR = /usr/local/jdk1.1.8/
+#JAVADIR = /usr/local/jdk1.1.8/
 #JAVABINDIR = $(JAVADIR)bin/
-LIBDIR = ../../lib/java-support
+#JAVAINCLUDEDIR = $(JAVADIR)include
+JAVAINCLUDEDIR = /usr/local/include/kaffe
 
+JAVAC = $(JAVABINDIR)javac
+JAVAH = $(JAVABINDIR)javah
+JAR = $(JAVABINDIR)jar
+
+TAR = tar
+
+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 = OpenXM.jar OM2OXM.class OMproxy.class libnative.so
 
 
@@ -16,10 +76,7 @@ configure:
 
 
 clean:
-	find . -name '*.class' \
-		-exec echo rm -f {} \; \
-		-exec rm -f {} \;
-	-rm -f *.so *.h *.jar
+	-rm -f *.so *.h *.jar *.class $(PKGTARGETS)
 
 
 distclean:	clean
@@ -29,17 +86,18 @@ distclean:	clean
 
 
 install:	all
-	if ! test -d $(LIBDIR); then \
-		mkdir -p $(LIBDIR); \
+	if ! test -d $(INSTALLDIR); then \
+		mkdir -p $(INSTALLDIR); \
 	fi
-	cp `find . -name '*.class'` $(TARGETS) $(LIBDIR)
+	$(TAR) cf - $(PKGTARGETS) $(TARGETS) | \
+		(cd $(INSTALLDIR) ; $(TAR) xf -)
 
 
 install2:
 
 
 test:
-	$(JAVABINDIR)javac -d . -deprecation -g *.java
+	$(JAVAC) -d . -deprecation -g *.java
 	make libnative.so
 
 
@@ -47,19 +105,19 @@ test:
 
 
 .java.class:
-	$(JAVABINDIR)javac -d . -O $<
+	$(JAVAC) -d . -O $<
 
 
-OpenXM.jar:	JP/ac/kobe_u/math/tam/OpenXM/*.java
-	$(JAVABINDIR)javac -d . -O $?
-	touch $@
-	-@#$(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 $*
+	-$(JAVAH) -jni $*
 
 
 libnative.so:	native.c OMproxy.h
-	cc -o libnative.so native.c \
-		-shared `find $(JAVADIR)/include/ -type d | sed 's/^/-I/'`
+	-$(CC) -o libnative.so native.c \
+		-shared `find $(JAVAINCLUDEDIR) -type d | sed 's/^/-I/'`