===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/Makefile,v
retrieving revision 1.8
retrieving revision 1.13
diff -u -p -r1.8 -r1.13
--- OpenXM/src/OpenMath/Makefile	2000/01/17 10:41:51	1.8
+++ OpenXM/src/OpenMath/Makefile	2000/01/17 17:09:24	1.13
@@ -1,17 +1,20 @@
 #
-# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.7 2000/01/13 12:35:56 tam Exp $
+# $OpenXM: OpenXM/src/OpenMath/Makefile,v 1.12 2000/01/17 16:53:43 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
 
-configure:
 
+all:	configure $(TARGETS)
 
-all:	OpenXM.jar OM2OXM.class OMproxy.class libnative.so
 
+configure:
 
+
 clean:
 	find . -name '*.class' \
 		-exec echo rm -f {} \; \
@@ -29,31 +32,32 @@ 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
+	$(JAVABINDIR)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
+	$(JAVABINDIR)javac -d . -O $?
+	touch $@
+	-@#$(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