Changeset 26657 for main

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

Location:

main/trunk/greenstone2/common-src/indexers

Files:

• mg/jni/Makefile.in (modified) (4 diffs)
• mgpp/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)/;
 
 

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

@@ -35 +35 @@
 LDFLAGS = @LDFLAGS@
 #NOTE: libmgpptext.a needs to come before libmgpplib.a !!!
-QUERY_LIBS = ../text/libmgpptext.a   ../lib/libmgpplib.a $(AFLIBS)  -lstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@
-PASSES_LIBS = ../text/libmgpppass.a ../lib/libmgpplib.a -lstdc++ @LIBS@
+QUERY_LIBS = ../text/libmgpptext.a   ../lib/libmgpplib.a $(AFLIBS) -static-libstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@
+PASSES_LIBS = ../text/libmgpppass.a ../lib/libmgpplib.a -static-libstdc++ @LIBS@
 TOUCH = echo timestamp >
 AWK = @AWK@
 
-JNIFLAGS=@JNIFLAGS@
+JNICFLAGS=@JNICFLAGS@
+JNILDFLAGS=@JNILDFLAGS@
+JNIPREFIX=@JNIPREFIX@
 JNISUFFIX=@JNISUFFIX@
 JNIINC=@JNIINC@
@@ -49 +51 @@
 mandir = $(prefix)/man/man1
 
-CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
+CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS) $(JNICFLAGS)
 
 .SUFFIXES:
@@ -64 +66 @@
     $(CXXCOMPILE) MGPPSearchWrapperImpl.cpp MGPPRetrieveWrapperImpl.cpp MGPPPassesWrapperImpl.cpp
 link:
-    $(CXX) $(LDFLAGS) $(JNIFLAGS) -o libmgppretrievejni.$(JNISUFFIX) MGPPRetrieveWrapperImpl.o $(QUERY_LIBS)
-    $(CXX) $(LDFLAGS) $(JNIFLAGS) -o libmgppsearchjni.$(JNISUFFIX) MGPPSearchWrapperImpl.o $(QUERY_LIBS)
-    $(CXX) $(LDFLAGS) $(JNIFLAGS) -o libmgpppassjni.$(JNISUFFIX) MGPPPassesWrapperImpl.o $(PASSES_LIBS)
+    $(CXX) $(LDFLAGS) $(JNILDFLAGS) -o $(JNIPREFIX)mgppretrievejni.$(JNISUFFIX) MGPPRetrieveWrapperImpl.o $(QUERY_LIBS)
+    $(CXX) $(LDFLAGS) $(JNILDFLAGS) -o $(JNIPREFIX)mgppsearchjni.$(JNISUFFIX) MGPPSearchWrapperImpl.o $(QUERY_LIBS)
+    $(CXX) $(LDFLAGS) $(JNILDFLAGS) -o $(JNIPREFIX)mgpppassjni.$(JNISUFFIX) MGPPPassesWrapperImpl.o $(PASSES_LIBS)
 
 clean:
-    rm -rf *.o libmgppretrievejni.$(JNISUFFIX) libmgppsearchjni.$(JNISUFFIX) libmgpppassjni.$(JNISUFFIX)
+    rm -rf *.o $(JNIPREFIX)mgppretrievejni.$(JNISUFFIX) $(JNIPREFIX)mgppsearchjni.$(JNISUFFIX) $(JNIPREFIX)mgpppassjni.$(JNISUFFIX)
 
 distclean: clean
@@ -76 +78 @@
 install:
 #   ../mkinstalldirs $(libdir); \
-#   cp libmgppjni.$(JNISUFFIX)  libmgpppassjni.$(JNISUFFIX)  $(libdir)/;
+#   cp $(JNIPREFIX)mgppjni.$(JNISUFFIX)  $(JNIPREFIX)mgpppassjni.$(JNISUFFIX)  $(libdir)/;