Changeset 21435 for main/trunk/greenstone2/runtime-src/src/colservr

Timestamp:

2010-01-07T14:23:27+13:00 (14 years ago)

Author:

ak19

Message:

Better way of setting the ENABLE_indexer and USE_SQLITE and ENABLE_JNI variables in the windows makefiles.

File:

• main/trunk/greenstone2/runtime-src/src/colservr/win32.mak (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/colservr/win32.mak

@@ -64 +64 @@
 !ENDIF
 
-!IF "$(USE_SQLITE)" == "0"
+!IF $(USE_SQLITE)
+SQLITE_DEFINES = -DUSE_SQLITE
+SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include"
+!ELSE
 SQLITE_DEFINES = 
 SQLITE_INCLUDES = 
-!ELSE
-SQLITE_DEFINES = -DUSE_SQLITE
-SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include"
 !ENDIF
 
@@ -78 +78 @@
 !ENDIF
 
-!IF "$(ENABLE_MG)" == "0"
-MG_DEFS =
-MG_SOURCES =
-MG_OBJECTS =
-MG_INCLUDES =
-!ELSE
+!IF $(ENABLE_MG)
 MG_DEFS = -DENABLE_MG
 MG_SOURCES = mgq.c \
@@ -96 +91 @@
     mgsource.obj
 MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text"
-!ENDIF
-
-!IF "$(ENABLE_MGPP)" == "0"
-MGPP_DEFS =
-MGPP_SOURCES =
-MGPP_OBJECTS =
-MGPP_INCLUDES =
-!ELSE
+!ELSE
+MG_DEFS =
+MG_SOURCES =
+MG_OBJECTS =
+MG_INCLUDES =
+!ENDIF
+
+!IF $(ENABLE_MGPP)
 MGPP_DEFS = -DENABLE_MGPP
 MGPP_SOURCES = mgppqueryfilter.cpp \
@@ -112 +107 @@
     mgppsource.obj
 MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
+!ELSE
+MGPP_DEFS =
+MGPP_SOURCES =
+MGPP_OBJECTS =
+MGPP_INCLUDES =
 !ENDIF