Changeset 21327 for main/trunk/greenstone2/common-src/win32.mak

Timestamp:

2009-12-09T21:49:00+13:00 (14 years ago)

Author:

ak19

Message:

Changes to makefiles, configure files, and source code to work with the new configure flags that allow indexers to be individually compiled up by setting each indexer to be enabled or disabled (enable-mg, enable-mgpp, enable-lucene).

File:

• main/trunk/greenstone2/common-src/win32.mak (modified) (6 diffs)

main/trunk/greenstone2/common-src/win32.mak

@@ -69 +69 @@
 MAKECMD = $(MAKECMD) DLLDEBUG=1
 !ENDIF
-!IF $(USE_SQLITE)
+!IF "$(USE_SQLITE)" == "0"
+MAKECMD = $(MAKECMD) USE_SQLITE=0
+!ELSE
 MAKECMD = $(MAKECMD) USE_SQLITE=1
 PACKAGEDIRS = $(PACKAGEDIRS) $(SQLITE_DIR)
@@ -94 +96 @@
     if NOT EXIST "iconv" unzip iconv.zip
     cd "$(COMMONHOME)"
+!IF "$(USE_SQLITE)" == "1"
     IF NOT EXIST $(SQLITE_DIR) IF EXIST "$(GSDLHOME)\bin\windows\gunzip.exe" IF EXIST "$(GSDLHOME)\bin\windows\tar.exe" "$(GSDLHOME)\bin\windows\gunzip.exe" -cd "$(SQLITE_DIR).tar.gz" | "$(GSDLHOME)\bin\windows\tar.exe" xv --directory=./packages/sqlite
     IF NOT EXIST $(SQLITE_DIR) echo ****** Couldn't extract archive $(SQLITE_DIR).tar.gz. Extract it manually, or check that gunzip.exe and tar.exe exist in GSDLHOME\bin\windows. ******
+!ENDIF
 
 clean:
@@ -137 +141 @@
     cd packages\search4j
     $(MAKECLEANCMD)
-!IF $(USE_SQLITE)
+!IF "$(USE_SQLITE)" == "1"
     cd "$(COMMONHOME)"
     cd "$(SQLITE_DIR)"
@@ -158 +162 @@
     cd "$(COMMONHOME)"
 
-$(SQLITE_DIR): FORCE
+$(SQLITE_DIR): 
+!IF "$(USE_SQLITE)" == "1"
+    FORCE
     cd "$(COMMONHOME)"
     cd "$@"
     $(MAKECMD)
     $(MAKECMD) install
+!ENDIF
     cd "$(COMMONHOME)"
 
@@ -169 +176 @@
     cd "$@"
     set DEBUG=$(DEBUG)
-    if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all gs2 
+    set ENABLE_MG=$(ENABLE_MG)
+    set ENABLE_MGPP=$(ENABLE_MGPP)
+    set ENABLE_LUCENE=$(ENABLE_LUCENE)
+
+    if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all gs2
     if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat install gs2
     if NOT EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all
@@ -175 +186 @@
 
     set DEBUG=
+    set ENABLE_MG=
+    set ENABLE_MGPP=
+    set ENABLE_LUCENE=
     if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows"
     if NOT EXIST "$(GSDLHOME)\bin\java" mkdir "$(GSDLHOME)\bin\java"