Changeset 8949 for trunk/indexers

Timestamp:

2005-02-02T12:16:10+13:00 (19 years ago)

Author:

kjdon

Message:

added in some stuff for java/jni wrapper around mgpp_passes

Location:

trunk/indexers/mgpp

Files:

• java/org/greenstone/mgpp/Makefile.in (modified) (1 diff)
• jni/Makefile.in (modified) (3 diffs)

trunk/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in

@@ -50 +50 @@
     $(JAVAC) -d $(JAVACLASSDIR) -sourcepath $(JAVASRCDIR) $(JAVACOPTIONS) *.java
     $(JAVAH) -classpath $(JAVACLASSPATH) -d $(MGPPHOME)/jni org.greenstone.mgpp.MGPPWrapper
+    $(JAVAH) -classpath $(JAVACLASSPATH) -d $(MGPPHOME)/jni org.greenstone.mgpp.MGPPPassesWrapper
+
     $(JAR) cf mgpp.jar -C $(JAVACLASSDIR) org
 
 clean:
-    rm -rf $(JAVACLASSDIR) mgpp.jar $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPWrapper.h
+    rm -rf $(JAVACLASSDIR) mgpp.jar $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPWrapper.h $(MGPPHOME)/jni/org_greenstone_mgpp_MGPPPassesWrapper.h
 
 install:

trunk/indexers/mgpp/jni/Makefile.in

@@ -23 +23 @@
 LDFLAGS = @LDFLAGS@
 #NOTE: libmgpptext.a needs to come before libmgpplib.a !!!
-LIBS = ../text/libmgpptext.a ../lib/libmgpplib.a -lstdc++ @LIBS@
+QUERY_LIBS = ../text/libmgpptext.a ../lib/libmgpplib.a -lstdc++ @LIBS@
+PASSES_LIBS = ../text/libmgpppass.a ../lib/libmgpplib.a -lstdc++ @LIBS@
 TOUCH = echo timestamp >
 AWK = @AWK@
@@ -46 +47 @@
 
 compile:
-    $(CXXCOMPILE) MGPPWrapperImpl.cpp
+    $(CXXCOMPILE) MGPPWrapperImpl.cpp MGPPPassesWrapperImpl.cpp
 link:
-    $(CXX) $(LDFLAGS) -shared -o libmgppjni.so MGPPWrapperImpl.o $(LIBS)
+    $(CXX) $(LDFLAGS) -shared -o libmgppjni.so MGPPWrapperImpl.o $(QUERY_LIBS)
+    $(CXX) $(LDFLAGS) -shared -o libmgpppassjni.so MGPPPassesWrapperImpl.o $(PASSES_LIBS)
 
 clean:
-    rm -rf *.o libmgppjni.so 
+    rm -rf *.o libmgppjni.so libmgpppassjni.so 
 
 distclean: clean
@@ -58 +60 @@
 install:
     ../mkinstalldirs $(libdir); \
-    cp libmgppjni.so  $(libdir)/;
+    cp libmgppjni.so  libmgpppassjni.so  $(libdir)/;