Include CQLSortNode.class

[cql-java-moved-to-github.git] / src / org / z3950 / zing / cql / Makefile

diff --git a/src/org/z3950/zing/cql/Makefile b/src/org/z3950/zing/cql/Makefile
index 5b2ca73..39c4f21 100644 (file)
--- a/src/org/z3950/zing/cql/Makefile
+++ b/src/org/z3950/zing/cql/Makefile
@@ -1,48 +1,34 @@
-# $Id: Makefile,v 1.6 2002-11-04 12:55:23 mike Exp $
-
-DOCDIR = ../../../../../docs
+# $Id: Makefile,v 1.18 2007-07-03 12:56:29 mike Exp $
+#
+# Your Java compiler will require that this source directory is on the
+# classpath.  The best way to do that is just to add the CQL-Java
+# distribution's "src" subdirectory to your CLASSPATH environment
+# variable, like this:
+#      CLASSPATH=$CLASSPATH:/where/ever/you/unpacked/it/cql-java-VERSION/src
 
 OBJ = Utils.class \
        CQLNode.class CQLTermNode.class CQLBooleanNode.class \
        CQLAndNode.class CQLOrNode.class CQLNotNode.class \
-       CQLRelation.class CQLProxNode.class ModifierSet.class \
-       CQLParser.class CQLLexer.class CQLParseException.class \
-       CQLGenerator.class ParameterMissingException.class
-
-../../../../../lib/cql-java.jar: $(OBJ)
-       cd ../../../..; jar cf ../lib/cql-java.jar org/z3950/zing/cql/*.class
-
-docs: $(DOCDIR)/overview-tree.html
-
-$(DOCDIR)/overview-tree.html: *.java
-       nice javadoc -d $(DOCDIR) -author -version \
-               -windowtitle cql-java org.z3950.zing.cql
+       CQLProxNode.class CQLPrefixNode.class CQLSortNode.class \
+       CQLPrefix.class \
+       CQLRelation.class Modifier.class ModifierSet.class \
+       CQLParser.class CQLLexer.class CQLGenerator.class \
+       CQLParseException.class MissingParameterException.class \
+       PQFTranslationException.class \
+       UnknownIndexException.class UnknownRelationException.class \
+       UnknownRelationModifierException.class UnknownPositionException.class
+
+JARPATH = ../lib/cql-java.jar
+JAR = ../../../../$(JARPATH)
+$(JAR): $(OBJ)
+       cd ../../../..; jar cf $(JARPATH) org/z3950/zing/cql/*.class
 
-# Your Java compiler will require that this source directory is on the
-# CLASSPATH.  You can either set your CLASSPATH environment variable
-# to include /where/ever/you/unpacked/it/cql-java-VERSION/src or try
-# changing the rule below to:
-#
-#      javac -classpath ../../../.. $<
-#
-# (But that will break if you need other elements in the CLASSPATH
-# too, for the Java library -- as, for example, Jikes does.)
-#
 %.class: %.java
-       javac $<
+       javac -Xlint:unchecked *.java
+
+test: $(JAR)
+       cd ../../../../../test/regression && make
 
 clean:
        rm -f $(OBJ) 'CQLLexer$$Keyword.class'
 
-cleandocs:
-       rm -rf  $(DOCDIR)/allclasses-frame.html \
-               $(DOCDIR)/deprecated-list.html \
-               $(DOCDIR)/help-doc.html \
-               $(DOCDIR)/index-all.html \
-               $(DOCDIR)/index.html \
-               $(DOCDIR)/org \
-               $(DOCDIR)/overview-tree.html \
-               $(DOCDIR)/package-list \
-               $(DOCDIR)/packages.html \
-               $(DOCDIR)/serialized-form.html \
-               $(DOCDIR)/stylesheet.css