Changeset 16525

Timestamp:

2008-07-24T09:59:51+12:00 (16 years ago)

Author:

kjdon

Message:

indexers makefile now has a gs2 target - does all compilation except for jni stuff. i.e. now includes lucene. top level makefile modified to use this

Files:

• gsdl/trunk/Makefile.in (modified) (2 diffs)
• indexers/trunk/Makefile.in (modified) (2 diffs)

gsdl/trunk/Makefile.in

@@ -57 +57 @@
 
 
-# we don't want to compile the java stuff in indexers for gs2
+# we don't want to compile the jni stuff in indexers for gs2
 all:
     for odir in $(INDEXERSDIR); do \
       echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \
+      (cd $$odir && $(MAKE) $(MDEFINES) gs2) || exit 1; \
     done
     for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
@@ -71 +71 @@
     for odir in $(INDEXERSDIR); do \
       echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) install-nojava) || exit 1; \
-    done    
+      (cd $$odir && $(MAKE) $(MDEFINES) install-gs2) || exit 1; \
+    done
+    cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper.jar bin/java/ 
     for idir in $(INSTALLDIRS); do \
       echo installing $$idir; \

indexers/trunk/Makefile.in

@@ -85 +85 @@
         done
 
+# make everything except jni stuff
+gs2:
+    for odir in $(UNAC) lucene-gs; do \
+          echo making $@ in $$odir; \
+          (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
+        done
+    for odir in mg mgpp; do \
+          echo making $@ in $$odir; \
+          (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \
+        done
+
+install-gs2:
+    for odir in $(UNAC) lucene-gs; do \
+          echo making $@ in $$odir; \
+          (cd $$odir && $(MAKE) $(MDEFINES) install) || exit 1; \
+        done
+    for odir in mg mgpp; do \
+          echo making $@ in $$odir; \
+          (cd $$odir && $(MAKE) $(MDEFINES) install-nojava) || exit 1; \
+        done
+
 
 distclean:
@@ -92 +113 @@
         done
     rm -f Makefile config.status config.log
+