Changeset 21366 for main/trunk/greenstone2/Makefile.in

Timestamp:

2009-12-16T14:11:07+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/Makefile.in (modified) (1 diff)

main/trunk/greenstone2/Makefile.in

@@ -55 +55 @@
 MODULEDIRS = @MODULEDIRS@
 
+ENABLE_JNI=@ENABLE_JNI@
+ifeq ($(ENABLE_JNI), 1)
+COMPILE_TARGET=with-jni
+else
+COMPILE_TARGET=without-jni
+endif
 
-# we don't want to compile the jni stuff in indexers for gs2
-all:
+
+# with some compilers, just calling another target is insufficient
+# so an extra echo stmt is added after each call to another target
+all:    $(COMPILE_TARGET)
+    @echo "Compile done"
+
+install: install-$(COMPILE_TARGET)
+    @echo "Install done"
+
+
+with-jni without-jni:
     for odir in $(SPECIAL_COMPILEDIRS); do \
-    echo making gs2 in $$odir; \
-    (cd $$odir && $(MAKE) $(MDEFINES) gs2) || exit 1; \
+      if test -d $$odir; then \
+        echo making $(COMPILE_TARGET) in $$odir; \
+        (cd $$odir && $(MAKE) $(MDEFINES) $(COMPILE_TARGET)) || exit 1; \
+      fi; \
     done
     for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
-      echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
+      if test -d $$odir; then \
+        echo making all in $$odir; \
+        (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
+      fi; \
     done
 
-install: all
+install-with-jni install-without-jni: all
     for idir in $(SPECIAL_INSTALLDIRS); do \
-      echo installing $$idir; \
-      (cd $$idir && $(MAKE) install-gs2) || exit 1; \
+      if test -d $$idir; then \
+        echo installing $$idir $(COMPILE_TARGET); \
+        (cd $$idir && $(MAKE) install-$(COMPILE_TARGET)) || exit 1; \
+      fi; \
     done
     for idir in $(INSTALLDIRS); do \
-      echo installing $$idir; \
-      (cd $$idir && $(MAKE) install) || exit 1; \
+      if test -d $$idir; then \
+        echo installing $$idir; \
+        (cd $$idir && $(MAKE) install) || exit 1; \
+      fi; \
     done
 
 apache-for-dist:
-    (cd runtime-src/packages && $(MAKE) apache-for-dist) || exit 1;
+    if test -d runtime-src; then \
+      (cd runtime-src/packages && $(MAKE) apache-for-dist) || exit 1; \
+    fi
 
-# include the Greenstone Server Interface Makefile here
-include GSI-Makefile
+# For GS2: include the Greenstone Server Interface Makefile here
+# http://www.makelinux.net/make3/make3-CHP-3-SECT-7.html
+sinclude GSI-Makefile
 
 distclean: clean
     rm -f Makefile config.cache config.h config.log stamp-h config.status
     for subdir in $(SPECIAL_COMPILEDIRS) $(COMPILEDIRS); do \
-      echo cleaning $@ in $$subdir; \
-      (cd $$subdir && $(MAKE) distclean) || exit 1; \
+      if test -d $$subdir; then \
+        echo cleaning $@ in $$subdir; \
+        (cd $$subdir && $(MAKE) distclean) || exit 1; \
+      fi; \
     done
 
 clean:
     for subdir in $(SPECIAL_COMPILEDIRS) $(COMPILEDIRS); do \
-      echo cleaning $@ in $$subdir; \
-      (cd $$subdir && $(MAKE) clean) || exit 1; \
+      if test -d $$subdir; then \
+        echo cleaning $@ in $$subdir; \
+        (cd $$subdir && $(MAKE) clean) || exit 1; \
+      fi; \
     done