Changeset 10191 for trunk/indexers/mg/jni/Makefile.in

Timestamp:

2005-06-29T12:33:27+12:00 (19 years ago)

Author:

kjdon

Message:

changes to jni stuff for Mac OS -configure now sets JNIINC, JNISUFFIX, JNIFLAGS for use in jni/Makefile.in - Mac OS has a different extension for the shared library, also uses different linker options

File:

• trunk/indexers/mg/jni/Makefile.in (modified) (4 diffs)

trunk/indexers/mg/jni/Makefile.in

@@ -26 +26 @@
 AWK = @AWK@
 
+JNIFLAGS=@JNIFLAGS@
+JNISUFFIX=@JNISUFFIX@
+JNIINC=@JNIINC@
 datadir = $(prefix)/share
 libexecdir = $(exec_prefix)/libexec
@@ -39 +42 @@
     $(CCOMPILE) $<
 
-
-INCLUDES = -I.. -I../lib -I../src/text -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+# can we get rid of JAVA_HOME from here??
+INCLUDES = -I.. -I../lib -I../src/text -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(JNIINC)
 
 all: compile link
@@ -48 +51 @@
 
 link:
-    $(CC) $(LDFLAGS) -shared -o libmgjni.so MGWrapperImpl.o $(QUERY_LIBS)
-    $(CC) $(LDFLAGS) -shared -o libmgpassjni.so  MGPassesWrapperImpl.o  $(PASSES_LIBS)
+    $(CC) $(LDFLAGS) $(JNIFLAGS) -o libmgjni.$(JNISUFFIX) MGWrapperImpl.o $(QUERY_LIBS)
+    $(CC) $(LDFLAGS)  $(JNIFLAGS) -o libmgpassjni.$(JNISUFFIX)  MGPassesWrapperImpl.o  $(PASSES_LIBS)
 
 clean:
-    rm -rf *.o libmgjni.so libmgpassjni.so 
+    rm -rf *.o libmgjni.$(JNISUFFIX) libmgpassjni.$(JNISUFFIX) 
 
 distclean: clean
@@ -59 +62 @@
 install:
     ../mkinstalldirs $(libdir); \
-    cp libmgjni.so libmgpassjni.so  $(libdir)/;
+    cp libmgjni.$(JNISUFFIX) libmgpassjni.$(JNISUFFIX)  $(libdir)/;