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 68087c1..39c4f21 100644 (file)
--- a/src/org/z3950/zing/cql/Makefile
+++ b/src/org/z3950/zing/cql/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 2007-06-27 22:44:40 mike Exp $
+# $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
@@ -9,7 +9,8 @@
 OBJ = Utils.class \
        CQLNode.class CQLTermNode.class CQLBooleanNode.class \
        CQLAndNode.class CQLOrNode.class CQLNotNode.class \
-       CQLProxNode.class CQLPrefixNode.class CQLPrefix.class \
+       CQLProxNode.class CQLPrefixNode.class CQLSortNode.class \
+       CQLPrefix.class \
        CQLRelation.class Modifier.class ModifierSet.class \
        CQLParser.class CQLLexer.class CQLGenerator.class \
        CQLParseException.class MissingParameterException.class \
@@ -17,12 +18,17 @@ OBJ = Utils.class \
        UnknownIndexException.class UnknownRelationException.class \
        UnknownRelationModifierException.class UnknownPositionException.class
 
-../../../../../lib/cql-java.jar: $(OBJ)
-       cd ../../../..; jar cf ../lib/cql-java.jar org/z3950/zing/cql/*.class
+JARPATH = ../lib/cql-java.jar
+JAR = ../../../../$(JARPATH)
+$(JAR): $(OBJ)
+       cd ../../../..; jar cf $(JARPATH) org/z3950/zing/cql/*.class
 
 %.class: %.java
        javac -Xlint:unchecked *.java
 
+test: $(JAR)
+       cd ../../../../../test/regression && make
+
 clean:
        rm -f $(OBJ) 'CQLLexer$$Keyword.class'