Ignore:
Timestamp:
2007-09-06T18:30:50+12:00 (14 years ago)
Author:
xiao
Message:

rearrange library generation for search and retrieve dlls.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • indexers/trunk/mgpp/jni/win32.mak

    r14495 r14502  
    4646 
    4747HEADERS = \
    48     MGPPSearchWrapperImpl.h   org_greenstone_mgpp_MGPPSearchWrapper.h
    49     MGPPRetrieveWrapperImpl.h   org_greenstone_mgpp_MGPPRetrieveWrapper.h 
    50     org_greenstone_mgpp_MGPPPassesWrapperImpl.h
     48    MGPPSearchWrapperImpl.h   MGPPRetrieveWrapperImpl.h   org_greenstone_mgpp_MGPPSearchWrapper.h \
     49   org_greenstone_mgpp_MGPPRetrieveWrapper.h org_greenstone_mgpp_MGPPPassesWrapperImpl.h
    5150
    5251SOURCES = \
    5352    MGPPSearchWrapperImpl.cpp MGPPRetrieveWrapperImpl.cpp MGPPPassesWrapperImpl.cpp
    5453
    55 OBJECTS = \
    56     MGPPSearchWrapperImpl$o MGPPRetrieveWrapperImpl$o  $(MGPPHOME)\text\libmgpptext.lib \
     54RETRIEVEOBJECTS = \
     55    MGPPRetrieveWrapperImpl$o  $(MGPPHOME)\text\libmgpptext.lib \
    5756    $(MGPPHOME)\lib\libmgpplib.lib
     57
     58SEARCHOBJETCS =  \
     59    MGPPSearchWrapperImpl$o $(MGPPHOME)\text\libmgpptext.lib \
     60    $(MGPPHOME)\lib\libmgpplib.lib
     61
     62
    5863PASSES_OBJECTS = \
    5964    MGPPPassesWrapperImpl$o $(MGPPHOME)\text\libmgpppass.lib \
     
    6873
    6974link:
    70         $(CC) -MD -LD $(OBJECTS) -Femgppjni.dll
    71         $(CC) -MD -LD $(PASSES_OBJECTS) -Femgpppassjni.dll
     75    $(CC) -MD -LD $(SEARCHOBJETCS) -Femgppsearchjni.dll
     76    $(CC) -MD -LD $(RETRIEVEOBJECTS) -Femgppretrievejni.dll
     77    $(CC) -MD -LD $(PASSES_OBJECTS) -Femgpppassjni.dll
    7278
    7379install:
     
    7581clean:
    7682    del *$o mgppsearchjni.dll mgppretrievejni.dll mgppjni.exp mgppjni.lib mgpppassjni.dll mgpppassjni.exp mgpppassjni.lib
    77     if exist mgsearchjni.lib del mgsearchjni.lib
    78     if exist mgretrievejni.lib del mgretrievejni.lib
     83    if exist mgppsearchjni.lib del mgppsearchjni.lib
     84    if exist mgppretrievejni.lib del mgppretrievejni.lib
    7985    if exist mgjni.lib del mgjni.lib
    8086
Note: See TracChangeset for help on using the changeset viewer.