Changeset 21487 for main/trunk/gs2runtime/Makefile.in

Timestamp:

2010-01-16T23:44:18+13:00 (14 years ago)

Author:

davidb

Message:

Adjustments to bring configure/Makefile logic in to line with main greenstone2 code

File:

• main/trunk/gs2runtime/Makefile.in (modified) (1 diff)

main/trunk/gs2runtime/Makefile.in

@@ -47 +47 @@
 ALLFILES = $(OBJECTS)
 
+SPECIAL_COMPILEDIRS = common-src
+COMPILEDIRS = runtime-src
 
-COMPILEDIRS = common-src runtime-src
-
-INSTALLDIRS = common-src runtime-src
+SPECIAL_INSTALLDIRS = common-src
+INSTALLDIRS = runtime-src
 
 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 \
+      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 \
+      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