===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/Makefile,v
retrieving revision 1.7
retrieving revision 1.12
diff -u -p -r1.7 -r1.12
--- OpenXM/src/OpenMath/Makefile	2000/01/13 12:35:56	1.7
+++ OpenXM/src/OpenMath/Makefile	2000/01/17 16:53:43	1.12
@@ -1,14 +1,20 @@
 #
-# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.6 1999/12/09 00:32:36 tam Exp $
+# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.11 2000/01/17 15:42:00 tam Exp $
 
 
-JAVADIR = /usr/local/jdk1.1.8
+JAVADIR = /usr/local/jdk1.1.8/
+JAVABINDIR = $(JAVADIR)bin/
 LIBDIR = ../../lib/java-support
 
+TARGETS = OpenXM.jar OM2OXM.class OMproxy.class libnative.so
 
-all:	install
 
+all:	configure $(TARGETS)
 
+
+configure:
+
+
 clean:
 	find . -name '*.class' \
 		-exec echo rm -f {} \; \
@@ -22,33 +28,37 @@ 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
+install:	all
 	if ! test -d $(LIBDIR); then \
 		mkdir -p $(LIBDIR); \
 	fi
-	cp ${.ALLSRC} $(LIBDIR)
+	cp `find . -name '*.class'` $(TARGETS) $(LIBDIR)
 
 
+install2:
+
+
+test:
+	$(JAVADIR)/bin/javac -d . -deprecation -g *.java
+	make libnative.so
+
+
 .SUFFIXES:	.java .class
 
 
-.java.class :
-	$(JAVADIR)/bin/javac -d . -O ${.IMPSRC}
+.java.class:
+	$(JAVABINDIR)javac -d . -O $<
 
 
-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'`
+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'`
 
 
 OMproxy.h:	OMproxy.class
-	$(JAVADIR)/bin/javah -jni ${.PREFIX}
+	-$(JAVABINDIR)javah -jni $*
 
 
 libnative.so:	native.c OMproxy.h