Merge pull request #7 from dennmar/file_revision

Removed unnecessary files and updated instructions in README.md

Makefile

@@ -1,85 +1,82 @@
 #############################################################################
 # The Walrus Graph Visualization Tool
 #
-# See Makefile.nodep for the real makefile rules and for additional
-# configuration options.
-#
-# This file is optional.  If you don't want to install or use jikes to build
-# dependency files, then you don't have to use this makefile at all--use
-# Makefile.nodep instead (either with "make -f Makefile.nodep" or by copying
-# Makefile.nodep over this file).  The caveat to using Makefile.nodep directly
-# is that some source files may not get properly recompiled when files are
-# modified.
-#
-# The only purpose of this file is to add rules for automatically generating
-# makefile dependency files (named *.u) with jikes.  These dependency files
-# help Make determine which additional source files need to be recompiled
-# whenever some source file changes.
-#
-# You may get warnings like the following the first time you run Make on this
-# file, but the warnings can be ignored:
-#
-#   Makefile:77: H3AdaptivePicker.u: No such file or directory
-#
-# $Id: Makefile,v 1.11 2005/03/25 00:38:49 youngh Exp $
+# $Id: Makefile.nodep,v 1.5 2005/03/25 00:39:24 youngh Exp $
 #############################################################################
 
-include Makefile.nodep
+# You must have mp.jar, antlrall-mod.jar, and libsea.jar in your CLASSPATH.
+
+JAVA = java
+JAVAC = javac
+JAVAC_FLAGS = #-classpath $$CLASSPATH
 
 #############################################################################
-# CONFIGURATION OPTIONS
+# NO FURTHER CONFIGURATION OPTIONS BELOW
 #############################################################################
 
-# The top-level installation directory of Java.
-#
-# For Linux and other Unix you want something like the following (but check
-# your system for the actual path):
-#JAVA_INSTALL = /usr/local/jdk1.4.1
-#JAVA_INSTALL = /usr/j2se  # Solaris
-#
-# For MacOS X:
-JAVA_INSTALL = /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+walrus_sources = H3AdaptivePicker.java \
+	H3AdaptiveRenderLoop.java \
+	H3AdaptiveRenderer.java \
+	H3Axes.java \
+	H3Canvas3D.java \
+	H3Circle.java \
+	H3CircleRenderer.java \
+	H3DisplayPosition.java \
+	H3Graph.java \
+	H3GraphLayout.java \
+	H3GraphLoader.java \
+	H3InteractiveRotationRequest.java \
+	H3LineRenderer.java \
+	H3Main.java \
+	H3Math.java \
+	H3Matrix4d.java \
+	H3MouseInputAdapter.java \
+	H3NonadaptivePicker.java \
+	H3NonadaptiveRenderLoop.java \
+	H3PickViewer.java \
+	H3Picker.java \
+	H3PickerCommon.java \
+	H3Point4d.java \
+	H3PointRenderList.java \
+	H3RenderList.java \
+	H3RenderLoop.java \
+	H3RenderQueue.java \
+	H3RepeatingRotationRequest.java \
+	H3RotationRequest.java \
+	H3Transform.java \
+	H3TransformQueue.java \
+	H3Transformer.java \
+	H3ViewParameters.java \
+	H3WobblingRotationRequest.java
 
-# The following two symbols, giving the path of various system jar files,
-# are needed to get Jikes to recognize the Java3D standard extension.
-#
-# For Linux and other Unix you want something like the following (but check
-# your system for the actual path):
-#JAVA_RUNTIME = $(JAVA_INSTALL)/jre/lib/rt.jar
-#JAVA_EXT_DIR = $(JAVA_INSTALL)/jre/lib/ext
-#
-# For MacOS X:
-JAVA_RUNTIME = /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar
-JAVA_EXT_DIR = /System/Library/Java/Extensions
+walrus_classes = $(walrus_sources:.java=.class)
 
-J3D_JARS = $(JAVA_EXT_DIR)/vecmath.jar:$(JAVA_EXT_DIR)/j3dcore.jar:$(JAVA_EXT_DIR)/j3daudio.jar:$(JAVA_EXT_DIR)/j3dutils.jar
+tester_sources = H3TransformQueueTester.java
 
-JIKES = jikes
-JIKES_FLAGS = -classpath $(JAVA_RUNTIME):$(J3D_JARS):$$CLASSPATH
-JIKES_DEPENDENCY_FLAGS = +B +M
+tester_classes = $(tester_sources:.java=.class)
 
-#############################################################################
-# NO FURTHER CONFIGURATION OPTIONS BELOW
-#############################################################################
+%.class: %.java
+	$(JAVAC) $(JAVAC_FLAGS) $<
 
-# Jikes occasionally includes the fully-qualified path of source and
-# class files when generating dependencies.  This almost always makes
-# these dependency files useless for anyone other than the current developer.
-#
-# Hence, for occasions when one wishes to distribute these dependency files,
-# so that an installation of Jikes is not a requirement to building LibSea,
-# this rule strips away the directory parts.  For day-to-day development,
-# this step is not necessary, of course.
-#
-# This assumes that stripping away the directory part of paths does not
-# cause ambiguity or cause files not to be found.  To ensure this, you
-# should especially take care to use ANTLR in a jar file, so that Jikes
-# elides dependencies on ANTLR classes.
-sanitize:
-	for F in *.u; do perl -i -n -MFile::Basename -e 's/\s//g; my ($$a,$$b) = split(/:/, $$_); print(basename($$a), " : ", basename($$b), "\n");' $$F; done
-
-%.u: %.java
-	$(JIKES) $(JIKES_FLAGS) $(JIKES_DEPENDENCY_FLAGS) $<
-
-include $(walrus_sources:.java=.u)
-include $(tester_sources:.java=.u)
+.PHONY: walrus tester all atonce pedantic clean distclean
+
+walrus: $(walrus_classes)
+
+tester: $(tester_classes)
+
+all: walrus tester
+
+atonce: $(walrus_sources) $(tester_sources)
+	$(JAVAC) $(JAVAC_FLAGS) $^
+
+pedantic:
+	$(MAKE) JAVAC=jikes JAVAC_FLAGS=+P
+
+jar:
+	jar cvmf distrib/manifest-supplement walrus.jar *.class walrus-splash.jpg
+
+clean:
+	-rm *.class *~
+
+distclean: clean
+	-rm *.u