Changeset 26657 for main/trunk/greenstone2/common-src/indexers/mg

Timestamp:

2013-01-10T15:44:31+13:00 (11 years ago)

Author:

davidb

Message:

Support for cross-compilation added. This particular set of changes focus on flags that assist cross-compilation with JNI

File:

• main/trunk/greenstone2/common-src/indexers/mg/jni/Makefile.in (modified) (4 diffs)

main/trunk/greenstone2/common-src/indexers/mg/jni/Makefile.in

@@ -27 +27 @@
 AWK = @AWK@
 
-JNIFLAGS=@JNIFLAGS@
+JNICFLAGS=@JNICFLAGS@
+JNILDFLAGS=@JNILDFLAGS@
+JNIPREFIX=@JNIPREFIX@
 JNISUFFIX=@JNISUFFIX@
 JNIINC=@JNIINC@
@@ -35 +37 @@
 mandir = $(prefix)/man/man1
 
-CCOMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
+CCOMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS) $(JNICFLAGS)
 
 .SUFFIXES:
@@ -51 +53 @@
 
 link:
-    $(CC) $(LDFLAGS) $(JNIFLAGS) -o libmgretrievejni.$(JNISUFFIX) MGRetrieveWrapperImpl.o $(QUERY_LIBS)
-    $(CC) $(LDFLAGS) $(JNIFLAGS) -o libmgsearchjni.$(JNISUFFIX) MGSearchWrapperImpl.o $(QUERY_LIBS)
-    $(CC) $(LDFLAGS)  $(JNIFLAGS) -o libmgpassjni.$(JNISUFFIX)  MGPassesWrapperImpl.o  $(PASSES_LIBS)
+    $(CC) $(LDFLAGS) $(JNILDFLAGS) -o $(JNIPREFIX)mgretrievejni.$(JNISUFFIX) MGRetrieveWrapperImpl.o $(QUERY_LIBS)
+    $(CC) $(LDFLAGS) $(JNILDFLAGS) -o $(JNIPREFIX)mgsearchjni.$(JNISUFFIX) MGSearchWrapperImpl.o $(QUERY_LIBS)
+    $(CC) $(LDFLAGS)  $(JNILDFLAGS) -o $(JNIPREFIX)mgpassjni.$(JNISUFFIX)  MGPassesWrapperImpl.o  $(PASSES_LIBS)
 
 clean:
-    rm -rf *.o libmgretrievejni.$(JNISUFFIX) libmgsearchjni.$(JNISUFFIX) libmgpassjni.$(JNISUFFIX) 
+    rm -rf *.o $(JNIPREFIX)mgretrievejni.$(JNISUFFIX) $(JNIPREFIX)mgsearchjni.$(JNISUFFIX) $(JNIPREFIX)mgpassjni.$(JNISUFFIX) 
 
 distclean: clean
@@ -63 +65 @@
 install:
 #   ../mkinstalldirs $(libdir); \
-#   cp libmgjni.$(JNISUFFIX) libmgpassjni.$(JNISUFFIX)  $(libdir)/;
+#   cp $(JNIPREFIX)mgjni.$(JNISUFFIX) $(JNIPREFIX)mgpassjni.$(JNISUFFIX)  $(libdir)/;