Show
Ignore:
Timestamp:
10.01.2013 15:44:31 (8 years ago)
Author:
davidb
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

    r25171 r26657  
    3535LDFLAGS = @LDFLAGS@ 
    3636#NOTE: libmgpptext.a needs to come before libmgpplib.a !!! 
    37 QUERY_LIBS = ../text/libmgpptext.a   ../lib/libmgpplib.a $(AFLIBS)  -lstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@ 
    38 PASSES_LIBS = ../text/libmgpppass.a ../lib/libmgpplib.a -lstdc++ @LIBS@ 
     37QUERY_LIBS = ../text/libmgpptext.a   ../lib/libmgpplib.a $(AFLIBS) -static-libstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@ 
     38PASSES_LIBS = ../text/libmgpppass.a ../lib/libmgpplib.a -static-libstdc++ @LIBS@ 
    3939TOUCH = echo timestamp > 
    4040AWK = @AWK@ 
    4141 
    42 JNIFLAGS=@JNIFLAGS@ 
     42JNICFLAGS=@JNICFLAGS@ 
     43JNILDFLAGS=@JNILDFLAGS@ 
     44JNIPREFIX=@JNIPREFIX@ 
    4345JNISUFFIX=@JNISUFFIX@ 
    4446JNIINC=@JNIINC@ 
     
    4951mandir = $(prefix)/man/man1 
    5052 
    51 CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS) 
     53CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS) $(JNICFLAGS) 
    5254 
    5355.SUFFIXES: 
     
    6466    $(CXXCOMPILE) MGPPSearchWrapperImpl.cpp MGPPRetrieveWrapperImpl.cpp MGPPPassesWrapperImpl.cpp 
    6567link: 
    66     $(CXX) $(LDFLAGS) $(JNIFLAGS) -o libmgppretrievejni.$(JNISUFFIX) MGPPRetrieveWrapperImpl.o $(QUERY_LIBS) 
    67     $(CXX) $(LDFLAGS) $(JNIFLAGS) -o libmgppsearchjni.$(JNISUFFIX) MGPPSearchWrapperImpl.o $(QUERY_LIBS) 
    68     $(CXX) $(LDFLAGS) $(JNIFLAGS) -o libmgpppassjni.$(JNISUFFIX) MGPPPassesWrapperImpl.o $(PASSES_LIBS) 
     68    $(CXX) $(LDFLAGS) $(JNILDFLAGS) -o $(JNIPREFIX)mgppretrievejni.$(JNISUFFIX) MGPPRetrieveWrapperImpl.o $(QUERY_LIBS) 
     69    $(CXX) $(LDFLAGS) $(JNILDFLAGS) -o $(JNIPREFIX)mgppsearchjni.$(JNISUFFIX) MGPPSearchWrapperImpl.o $(QUERY_LIBS) 
     70    $(CXX) $(LDFLAGS) $(JNILDFLAGS) -o $(JNIPREFIX)mgpppassjni.$(JNISUFFIX) MGPPPassesWrapperImpl.o $(PASSES_LIBS) 
    6971 
    7072clean: 
    71     rm -rf *.o libmgppretrievejni.$(JNISUFFIX) libmgppsearchjni.$(JNISUFFIX) libmgpppassjni.$(JNISUFFIX) 
     73    rm -rf *.o $(JNIPREFIX)mgppretrievejni.$(JNISUFFIX) $(JNIPREFIX)mgppsearchjni.$(JNISUFFIX) $(JNIPREFIX)mgpppassjni.$(JNISUFFIX) 
    7274 
    7375distclean: clean 
     
    7678install: 
    7779#   ../mkinstalldirs $(libdir); \ 
    78 #   cp libmgppjni.$(JNISUFFIX)  libmgpppassjni.$(JNISUFFIX)  $(libdir)/; 
     80#   cp $(JNIPREFIX)mgppjni.$(JNISUFFIX)  $(JNIPREFIX)mgpppassjni.$(JNISUFFIX)  $(libdir)/; 
    7981 
    8082