Changeset 21365 for main/trunk/greenstone2/common-src/Makefile.in

Timestamp:

2009-12-16T14:10:51+13:00 (14 years ago)

Author:

ak19

Message:

New configuration and compilation flag ENABLE_JNI added which will be disabled by default for GS2 since in general GS doesn't need mg and mgpp compiled up with jni. GS3's build.xml will need to explicitly set ENABLE_JNI to compile mg and mgpp with jni.

File:

• main/trunk/greenstone2/common-src/Makefile.in (modified) (2 diffs)

main/trunk/greenstone2/common-src/Makefile.in

@@ -65 +65 @@
 
 
-all:
-    for odir in $(INDEXERSDIR) $(COMPILEDIRS) $(MODULEDIRS); do \
+with-jni without-jni: 
+    for odir in $(INDEXERSDIR); do \
       echo making $@ in $$odir; \
       (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     done
+    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
+      echo making all in $$odir; \
+      (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
+    done
 
-install: 
+install-with-jni: 
     for odir in $(INDEXERSDIR); do \
       echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) install) || exit 1; \
+      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     done
     if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper.jar; then \
@@ -84 +88 @@
     done
 
-gs2: 
-    for odir in $(INDEXERSDIR); do \
-      echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
-    done
-    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
-      echo making all in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
-    done
-
-install-gs2:
+install-without-jni:
     for odir in $(INDEXERSDIR); do \
       echo making $@ in $$odir; \