Changeset 10192 for trunk/indexers/mgpp/jni/Makefile.in

Timestamp:

2005-06-29T13:29:30+12:00 (19 years ago)

Author:

kjdon

Message:

modified so that jni stuff works on Mac OS. in configure.in changed the names of some of the vars that george had added.

File:

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

trunk/indexers/mgpp/jni/Makefile.in

@@ -28 +28 @@
 AWK = @AWK@
 
+JNIFLAGS=@JNIFLAGS@
+JNISUFFIX=@JNISUFFIX@
+JNIINC=@JNIINC@
+
 datadir = $(prefix)/share
 libexecdir = $(exec_prefix)/libexec
@@ -41 +45 @@
     $(CXXCOMPILE) $<
 
-
-INCLUDES = -I.. -I../lib -I../text -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+# can we get rid of JAVA_HOME from here??
+INCLUDES = -I.. -I../lib -I../text -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(JNIINC)
 
 all: compile link
@@ -49 +53 @@
     $(CXXCOMPILE) MGPPWrapperImpl.cpp MGPPPassesWrapperImpl.cpp
 link:
-    $(CXX) $(LDFLAGS) -shared -o libmgppjni.so MGPPWrapperImpl.o $(QUERY_LIBS)
-    $(CXX) $(LDFLAGS) -shared -o libmgpppassjni.so MGPPPassesWrapperImpl.o $(PASSES_LIBS)
+    $(CXX) $(LDFLAGS) $(JNIFLAGS) -o libmgppjni.$(JNISUFFIX) MGPPWrapperImpl.o $(QUERY_LIBS)
+    $(CXX) $(LDFLAGS) $(JNIFLAGS) -o libmgpppassjni.$(JNISUFFIX) MGPPPassesWrapperImpl.o $(PASSES_LIBS)
 
 clean:
-    rm -rf *.o libmgppjni.so libmgpppassjni.so 
+    rm -rf *.o libmgppjni.$(JNISUFFIX) libmgpppassjni.$(JNISUFFIX)
 
 distclean: clean
@@ -60 +64 @@
 install:
     ../mkinstalldirs $(libdir); \
-    cp libmgppjni.so  libmgpppassjni.so  $(libdir)/;
+    cp libmgppjni.$(JNISUFFIX)  libmgpppassjni.$(JNISUFFIX)  $(libdir)/;