Changeset 21348

Show
Ignore:
Timestamp:
15.12.2009 15:25:48 (10 years ago)
Author:
xiao
Message:

GS2build's win32.mak (and Makefile and configure) aren't used by greenstone3's build.xml file. Only the makefiles of common-src and build-src are called. So the recent changes to enable individual indexers using the ENABLE_ flags are expanded to allow common-src to be able to deal with these flags its own.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/win32.mak

    r21338 r21348  
    5454 
    5555SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.5.9 
     56 
     57# indexers requires the ENABLE_indexer flags to be either 1 or 0, 
     58# so we ensure this is the case here 
     59!IF "$(ENABLE_MG)" != "0" 
     60ENABLE_MG = 1 
     61!ENDIF 
     62!IF "$(ENABLE_MGPP)" != "0" 
     63ENABLE_MGPP = 1 
     64!ENDIF 
     65!IF "$(ENABLE_LUCENE)" != "0" 
     66ENABLE_LUCENE = 1 
     67!ENDIF 
    5668 
    5769MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" BINDIR="$(GSDLHOME)\bin\windows"