Changeset 18813 for indexers/trunk

Timestamp:

2009-03-26T12:30:59+13:00 (15 years ago)

Author:

mdewsnip

Message:

Improved LuceneWrapper Makefile to avoid recompiling all the Java files and generating the LuceneWrapper.jar file each time.

File:

• indexers/trunk/lucene-gs/Makefile (modified) (1 diff)

indexers/trunk/lucene-gs/Makefile

@@ -3 +3 @@
 
 LUCENE_JAR = ./lib/lucene-core-2.3.2.jar
-CLASSPATH = $(LUCENE_JAR):classes
 
-all: compile jar
 
-compile:
-    mkdir -p classes
-    $(JAVAC) -classpath $(CLASSPATH):. -d classes -sourcepath src/ src/org/greenstone/LuceneWrapper/*.java
+LUCENE_WRAPPER_OBJECTS = \
+    classes/org/greenstone/LuceneWrapper/GS2Analyzer.class \
+    classes/org/greenstone/LuceneWrapper/GS2IndexModifier.class \
+    classes/org/greenstone/LuceneWrapper/GS2LuceneDelete.class \
+    classes/org/greenstone/LuceneWrapper/GS2LuceneEditor.class \
+    classes/org/greenstone/LuceneWrapper/GS2LuceneIndexer.class \
+    classes/org/greenstone/LuceneWrapper/GS2LuceneQuery.class \
+    classes/org/greenstone/LuceneWrapper/LuceneQueryResult.class \
 
-jar:
-    cd classes && $(JAR) xf ../$(LUCENE_JAR)
-    $(JAR) cf LuceneWrapper.jar -C classes .
+LUCENE_WRAPPER_JAR = LuceneWrapper.jar
 
-install:
+
+classes/%.class: src/%.java
+    mkdir -p classes && $(JAVAC) -classpath $(LUCENE_JAR):classes:. -d classes -sourcepath src/ src/$*.java
+
+LuceneWrapper.jar: $(LUCENE_WRAPPER_OBJECTS)
+    cd classes && jar xf ../$(LUCENE_JAR)
+    $(JAR) cf $(LUCENE_WRAPPER_JAR) -C classes .
+
+all: $(LUCENE_WRAPPER_JAR)
+
+install: $(LUCENE_WRAPPER_JAR)
 
 clean:
-    /bin/rm -f classes/org/greenstone/LuceneWrapper/*.class
+    /bin/rm -f $(LUCENE_WRAPPER_OBJECTS) $(LUCENE_WRAPPER_JAR)
 
 distclean: clean
     if test -e classes; then /bin/rm -r classes; fi
-    if test -e LuceneWrapper.jar; then /bin/rm -r LuceneWrapper.jar; fi
+    if test -e $(LUCENE_WRAPPER_JAR); then /bin/rm -r $(LUCENE_WRAPPER_JAR); fi