X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Forg%2Fz3950%2Fzing%2Fcql%2FMakefile;h=6df338a70cd5ca52d38104a899e0e13900bc3708;hb=8e35f984081a29de9b53af7c1b2fbf981c474d88;hp=4bc961eaadece2dc90392d75b42dd601829d13ad;hpb=b4c87f12830bb1525aebb00e98dce5e6153bea71;p=cql-java-moved-to-github.git

diff --git a/src/org/z3950/zing/cql/Makefile b/src/org/z3950/zing/cql/Makefile
index 4bc961e..6df338a 100644
--- a/src/org/z3950/zing/cql/Makefile
+++ b/src/org/z3950/zing/cql/Makefile
@@ -1,50 +1,33 @@
-# $Id: Makefile,v 1.10 2002-11-12 22:38:35 mike Exp $
-
-DOCDIR = ../../../../../docs
+# $Id: Makefile,v 1.17 2007-06-29 11:48:04 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 MissingParameterException.class \
+	CQLProxNode.class CQLPrefixNode.class CQLPrefix.class \
+	CQLRelation.class Modifier.class ModifierSet.class \
+	CQLParser.class CQLLexer.class CQLGenerator.class \
+	CQLParseException.class MissingParameterException.class \
 	PQFTranslationException.class \
-	UnknownQualifierException.class UnknownRelationException.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
 
-# ### FIX THIS COMMENT!
-# Your Java compiler will require that this source directory is on the
-# classpath.  Generally, you can use the rules below, which set the
-# classpath suitably.  But that will break if you need other elements
-# in the CLASSPATH too.  If that's the situation you're in, take the
-# "-classpath ../../../.." flag out of the rules below, and set your
-# CLASSPATH environment variable to include
-#	/where/ever/you/unpacked/it/cql-java-VERSION/src
-#
 %.class: %.java
-	javac $<
-
-docs: $(DOCDIR)/overview-tree.html
+	javac -Xlint:unchecked *.java
 
-$(DOCDIR)/overview-tree.html: *.java
-	nice javadoc -d $(DOCDIR) -author -version \
-		-windowtitle cql-java org.z3950.zing.cql
+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