Changeset 21325

Show
Ignore:
Timestamp:
09.12.2009 21:42:36 (10 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).

Location:
main/trunk/greenstone2/common-src/src
Files:
3 added
10 modified

Legend:

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

    r19882 r21325  
    5050 
    5151DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE 
    52 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\db2txt" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib" \ 
     52INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\db2txt" -I"$(COMMON_DIR)\src\lib" \ 
    5353       -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 
    5454!IF $(GSDL_VC4) 
     
    5757!ENDIF 
    5858 
    59 LIBS = "$(COMMON_DIR)\indexers\mg\lib\unitool.obj" "$(COMMON_DIR)\src\lib\gsdllib.lib" \ 
     59LIBS = "$(COMMON_DIR)\src\lib\gsdllib.lib" \ 
    6060       "$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\gdbm.lib" 
    6161 
  • main/trunk/greenstone2/common-src/src/gdbmedit/gdbmdel/win32.mak

    r19882 r21325  
    5151 
    5252DEFS = -D__WIN32__ -DHAVE_CONFIG_H 
    53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmdel" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib" \ 
     53INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmdel" -I"$(COMMON_DIR)\src\lib" \ 
    5454       -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 
    5555!IF $(USE_STLPORT) 
  • main/trunk/greenstone2/common-src/src/gdbmedit/gdbmget/win32.mak

    r19882 r21325  
    5151 
    5252DEFS = -D__WIN32__ -DHAVE_CONFIG_H 
    53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmget" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib" \ 
     53INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmget" -I"$(COMMON_DIR)\src\lib" \ 
    5454       -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 
    5555!IF $(USE_STLPORT) 
  • main/trunk/greenstone2/common-src/src/gdbmedit/gdbmkeys/win32.mak

    r19882 r21325  
    5151 
    5252DEFS = -D__WIN32__ -DHAVE_CONFIG_H 
    53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmkeys" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib" \ 
     53INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmkeys" -I"$(COMMON_DIR)\src\lib" \ 
    5454       -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 
    5555!IF $(USE_STLPORT) 
  • main/trunk/greenstone2/common-src/src/gdbmedit/gdbmset/win32.mak

    r19882 r21325  
    5151 
    5252DEFS = -D__WIN32__ -DHAVE_CONFIG_H 
    53 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmset" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib" \ 
     53INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmset" -I"$(COMMON_DIR)\src\lib" \ 
    5454       -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 
    5555!IF $(USE_STLPORT) 
  • main/trunk/greenstone2/common-src/src/gdbmedit/txt2db/Makefile.in

    r18224 r21325  
    5858 
    5959GSDL_LIBS = \ 
    60     $(COMMON_DIR)/src/lib/gsdllib.a \ 
    61     $(COMMON_DIR)/indexers/mg/lib/libmglib.a 
     60    $(COMMON_DIR)/src/lib/gsdllib.a  
    6261 
    6362EXECUTABLE_OBJECTS = \ 
  • main/trunk/greenstone2/common-src/src/gdbmedit/txt2db/win32.mak

    r19882 r21325  
    5050 
    5151DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE 
    52 INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\txt2db" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib" \ 
     52INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\txt2db" -I"$(COMMON_DIR)\src\lib" \ 
    5353       -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3" -I"$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\windows" 
    5454!IF $(GSDL_VC4) 
     
    5757!ENDIF 
    5858 
    59 LIBS = "$(COMMON_DIR)\indexers\mg\lib\unitool.obj" "$(COMMON_DIR)\src\lib\gsdllib.lib" \ 
     59LIBS = "$(COMMON_DIR)\src\lib\gsdllib.lib" \ 
    6060       "$(COMMON_DIR)\packages\gdbm\gdbm-1.8.3\gdbm.lib" 
    6161 
  • main/trunk/greenstone2/common-src/src/lib/Makefile.in

    r19966 r21325  
    4848CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 
    4949DEFS = @DEFS@ 
    50 INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES) 
     50INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include $(SQLITE_INCLUDES) 
    5151RANLIB = @RANLIB@ 
    5252 
     
    7878    phrases.cpp \ 
    7979    text_t.cpp \ 
     80    unitool.cpp \ 
    8081    $(SQLITE_SOURCES) 
    8182 
     
    9798    phrases.o \ 
    9899    text_t.o \ 
     100    unitool.o \ 
    99101    $(SQLITE_OBJECTS) 
    100102 
  • main/trunk/greenstone2/common-src/src/lib/gsdlunicode.cpp

    r8727 r21325  
    2929// unitool is currently in mg, if mg is not being used it should 
    3030// be moved into GSDLHOME/lib  
     31// A copy of mgpp's unitool has now been moved into common-src/src/lib/ 
    3132#include "unitool.h" 
    3233 
  • main/trunk/greenstone2/common-src/src/lib/win32.mak

    r19875 r21325  
    6868!ENDIF 
    6969 
    70 !IF $(USE_SQLITE) 
     70!IF "$(USE_SQLITE)" == "0" 
     71SQLITE_INCLUDES =  
     72SQLITE_OBJECTS =  
     73SQLITE_SOURCES =  
     74!ELSE 
    7175SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include" 
    7276SQLITE_OBJECTS = sqlitedbclass.obj 
    7377SQLITE_SOURCES = sqlitedbclass.cpp 
    74 !ELSE 
    75 SQLITE_INCLUDES =  
    76 SQLITE_OBJECTS =  
    77 SQLITE_SOURCES =  
    7878!ENDIF 
    7979 
     
    8282CC = cl 
    8383DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
    84 INCLUDES = -I"$(COMMON_DIR)" -I"$(INDEXERS_DIR)\mg\lib" \ 
     84INCLUDES = -I"$(COMMON_DIR)" \ 
    8585    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \ 
    8686    $(SQLITE_INCLUDES) 
     
    121121    phrases.cpp \ 
    122122    text_t.cpp \ 
     123    unitool.cpp \ 
    123124    $(SQLITE_SOURCES) \ 
    124125    $(MSSQL_SOURCES) 
     
    141142    phrases.obj \ 
    142143    text_t.obj \ 
     144    unitool.obj \ 
    143145    $(SQLITE_OBJECTS) \ 
    144146        $(MSSQL_OBJECTS)