Changeset 14502

Timestamp:

2007-09-06T18:30:50+12:00 (17 years ago)

Author:

xiao

Message:

rearrange library generation for search and retrieve dlls.

File:

• indexers/trunk/mgpp/jni/win32.mak (modified) (3 diffs)

indexers/trunk/mgpp/jni/win32.mak

@@ -46 +46 @@
  
 HEADERS = \
-    MGPPSearchWrapperImpl.h   org_greenstone_mgpp_MGPPSearchWrapper.h
-    MGPPRetrieveWrapperImpl.h   org_greenstone_mgpp_MGPPRetrieveWrapper.h  
-    org_greenstone_mgpp_MGPPPassesWrapperImpl.h
+    MGPPSearchWrapperImpl.h   MGPPRetrieveWrapperImpl.h   org_greenstone_mgpp_MGPPSearchWrapper.h \
+   org_greenstone_mgpp_MGPPRetrieveWrapper.h org_greenstone_mgpp_MGPPPassesWrapperImpl.h
 
 SOURCES = \
     MGPPSearchWrapperImpl.cpp MGPPRetrieveWrapperImpl.cpp MGPPPassesWrapperImpl.cpp
 
-OBJECTS = \
-    MGPPSearchWrapperImpl$o MGPPRetrieveWrapperImpl$o  $(MGPPHOME)\text\libmgpptext.lib \
+RETRIEVEOBJECTS = \
+    MGPPRetrieveWrapperImpl$o  $(MGPPHOME)\text\libmgpptext.lib \
     $(MGPPHOME)\lib\libmgpplib.lib
+
+SEARCHOBJETCS =  \
+    MGPPSearchWrapperImpl$o $(MGPPHOME)\text\libmgpptext.lib \
+    $(MGPPHOME)\lib\libmgpplib.lib
+
+
 PASSES_OBJECTS = \
     MGPPPassesWrapperImpl$o $(MGPPHOME)\text\libmgpppass.lib \
@@ -68 +73 @@
 
 link:
-        $(CC) -MD -LD $(OBJECTS) -Femgppjni.dll
-        $(CC) -MD -LD $(PASSES_OBJECTS) -Femgpppassjni.dll
+    $(CC) -MD -LD $(SEARCHOBJETCS) -Femgppsearchjni.dll
+    $(CC) -MD -LD $(RETRIEVEOBJECTS) -Femgppretrievejni.dll
+    $(CC) -MD -LD $(PASSES_OBJECTS) -Femgpppassjni.dll
 
 install: 
@@ -75 +81 @@
 clean:
     del *$o mgppsearchjni.dll mgppretrievejni.dll mgppjni.exp mgppjni.lib mgpppassjni.dll mgpppassjni.exp mgpppassjni.lib 
-    if exist mgsearchjni.lib del mgsearchjni.lib
-    if exist mgretrievejni.lib del mgretrievejni.lib
+    if exist mgppsearchjni.lib del mgppsearchjni.lib
+    if exist mgppretrievejni.lib del mgppretrievejni.lib
     if exist mgjni.lib del mgjni.lib