Changeset 22080 for main/trunk


Ignore:
Timestamp:
2010-05-12T20:43:56+12:00 (14 years ago)
Author:
ak19
Message:

Undoing partial commit: accidentally committed windows makefiles along with the Linux makefiles which were the only ones I wanted to commit. Undoing commit because the changes are untested and only some changed files were committed.

Location:
main/trunk/greenstone2/runtime-src/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak

    r22078 r22080  
    4343DLLDEBUG = 0
    4444ENABLE_ACCENTFOLD = 1
    45 USE_GDBM = 1
    46 USE_JDBM = 1
    4745USE_SQLITE = 1
    48 USE_MSSQL = 0
    4946ENABLE_MG = 1
    5047ENABLE_MGPP = 1
    … …  
    7774!ENDIF
    7875
    79 !IF $(USE_GDBM)
    80 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \
    81     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
    82 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
    83 GDBM_DEFINES = -DUSE_GDBM
    84 !ELSE
    85 GDBM_INCLUDES =
    86 GDBM_LIBS =
    87 GDBM_DEFINES =
    88 !ENDIF
    89 
    90 !IF $(USE_JDBM)
    91 JDBM_DEFINES = -DUSE_JDBM
    92 !ELSE
    93 JDBM_DEFINES =
    94 !ENDIF
    95 
    9676!IF $(USE_SQLITE)
    9777SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    98 SQLITE_DEFINES = -DUSE_SQLITE
    9978!ELSE
    10079SQLITE_LIBS =
    101 SQLITE_DEFINES =
    102 !ENDIF
    103 
    104 !IF $(USE_MSSQL)
    105 MSSQL_DEFINES = -DUSE_MSSQL
    106 !ELSE
    107 MSSQL_DEFINES =
    10880!ENDIF
    10981
    … …  
    138110CC = cl
    139111DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    140         -DGSDL_NOCACHE $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
    141     $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
     112        -DGSDL_NOCACHE $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
    142113INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    143114        $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \
    144     $(GDBM_INCLUDES) \
     115    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
    145116    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat"
    146117LDFLAGS =
    147118LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
    148         $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
     119        "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
    149120
    150121!IF $(GSDL_VC4)

  • main/trunk/greenstone2/runtime-src/src/protocol/win32.mak

    r22078 r22080  
    3838DLL = 0
    3939DLLDEBUG = 0
    40 USE_GDBM = 1
    41 USE_JDBM = 1
    42 USE_SQLITE = 1
    43 USE_MSSQL = 0
    4440ENABLE_MG = 1
    4541ENABLE_MGPP = 1
    … …  
    6460CXXFLAGS = $(CXXFLAGS) -MDd
    6561!ENDIF
    66 !ENDIF
    67 
    68 !IF $(USE_GDBM)
    69 GDBM_DEFINES = -DUSE_GDBM
    70 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm
    71 !ELSE
    72 GDBM_DEFINES =
    73 GDBM_INCLUDES =
    74 !ENDIF
    75 
    76 !IF $(USE_JDBM)
    77 JDBM_DEFINES = -DUSE_JDBM
    78 !ELSE
    79 JDBM_DEFINES =
    80 !ENDIF
    81 
    82 !IF $(USE_SQLITE)
    83 SQLITE_DEFINES = -DUSE_SQLITE
    84 !ELSE
    85 SQLITE_DEFINES =
    86 !ENDIF
    87 
    88 !IF $(USE_MSSQL)
    89 MSSQL_DEFINES = -DUSE_MSSQL
    90 !ELSE
    91 MSSQL_DEFINES =
    9262!ENDIF
    9363
    … …  
    11585CC = cl
    11686DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    117     $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
    11887    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
    11988# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    12089INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \
    121      $(GDBM_INCLUDES)
     90     -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"
    12291
    12392!IF $(GSDL_VC4)

  • main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

    r22078 r22080  
    4545ENABLE_ACCENTFOLD = 1
    4646USE_GDBM = 1
    47 USE_JDBM = 1
    4847USE_SQLITE = 1
    49 USE_MSSQL = 0
    5048ENABLE_MG = 1
    5149ENABLE_MGPP = 1
    … …  
    8078!IF $(USE_GDBM)
    8179GDBM_DEFINES = -DUSE_GDBM
    82 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
    8380GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
    8481!ELSE
    8582GDBM_DEFINES =
    86 GDBM_LIBS =
    8783GDBM_INCLUDES =
    88 !ENDIF
    89 
    90 !IF $(USE_JDBM)
    91 JDBM_DEFINES = -DUSE_JDBM
    92 !ELSE
    93 JDBM_DEFINES =
    9484!ENDIF
    9585
    … …  
    10494SQL_OBJECTS =
    10595SQLITE_LIBS =
    106 !ENDIF
    107 
    108 !IF $(USE_MSSQL)
    109 MSSQL_DEFINES = -DUSE_MSSQL
    110 !ELSE
    111 MSSQL_DEFINES =
    11296!ENDIF
    11397
    … …  
    158142CC = cl
    159143DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    160         -DGSDL_NOCACHE $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
    161     $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
     144        -DGSDL_NOCACHE $(GDBM_DEFINES) $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
    162145INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
    163146    $(MG_INCLUDES) $(MGPP_INCLUDES) \
    … …  
    167150LDFLAGS =
    168151LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
    169        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
     152        "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
    170153
    171154!IF $(GSDL_VC4)

  • main/trunk/greenstone2/runtime-src/src/w32server/win32.mak

    r22078 r22080  
    4040DEBUG = 0
    4141ENABLE_ACCENTFOLD = 1
    42 USE_GDBM = 1
    43 USE_JDBM = 1
    4442USE_SQLITE = 1
    45 USE_MSSQL = 0
    4643ENABLE_MG = 1
    4744ENABLE_MGPP = 1
    … …  
    6966!ENDIF
    7067
    71 !IF $(USE_GDBM)
    72 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \
    73     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
    74 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
    75 GDBM_DEFINES = -DUSE_GDBM
    76 !ELSE
    77 GDBM_INCLUDES =
    78 GDBM_LIBS =
    79 GDBM_DEFINES =
    80 !ENDIF
    81 
    82 !IF $(USE_JDBM)
    83 JDBM_DEFINES = -DUSE_JDBM
    84 !ELSE
    85 JDBM_DEFINES =
    86 !ENDIF
    87 
    8868!IF $(USE_SQLITE)
    8969SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    90 SQLITE_DEFINES = -DUSE_SQLITE
    9170!ELSE
    9271SQLITE_LIBS =
    93 SQLITE_DEFINES =
    94 !ENDIF
    95 
    96 !IF $(USE_MSSQL)
    97 MSSQL_DEFINES = -DUSE_MSSQL
    98 !ELSE
    99 MSSQL_DEFINES =
    10072!ENDIF
    10173
    … …  
    131103CC = cl
    132104DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    133     $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
    134105    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
    135106INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    136     $(GDBM_INCLUDES) \ 
     107    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
    137108    -I"$(COLSERVR_DIR)" \
    138109    $(MG_INCLUDES) \
    … …  
    140111
    141112LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
    142         $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
     113        "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
    143114RSC = rc
    144115WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \

  • main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

    r22078 r22080  
    4141DLLDEBUG = 0
    4242ENABLE_ACCENTFOLD = 1
    43 USE_GDBM = 1
    44 USE_JDBM = 1
    4543USE_SQLITE = 1
    46 USE_MSSQL = 0
    4744ENABLE_MG = 1
    4845ENABLE_MGPP = 1
    … …  
    7572!ENDIF
    7673
    77 !IF $(USE_GDBM)
    78 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \
    79     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
    80 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
    81 GDBM_DEFINES = -DUSE_GDBM
    82 !ELSE
    83 GDBM_INCLUDES =
    84 GDBM_LIBS =
    85 GDBM_DEFINES =
    86 !ENDIF
    87 
    88 !IF $(USE_JDBM)
    89 JDBM_DEFINES = -DUSE_JDBM
    90 !ELSE
    91 JDBM_DEFINES =
    92 !ENDIF
    93 
    9474!IF $(USE_SQLITE)
    95 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib
    96 SQLITE_DEFINES = -DUSE_SQLITE
     75SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    9776!ELSE
    9877SQLITE_LIBS =
    99 SQLITE_DEFINES =
    100 !ENDIF
    101 
    102 !IF $(USE_MSSQL)
    103 MSSQL_DEFINES = -DUSE_MSSQL
    104 !ELSE
    105 MSSQL_DEFINES =
    10678!ENDIF
    10779
    … …  
    135107CC = cl
    136108DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    137     $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
    138109    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
    139110# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
    … …  
    141112    $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
    142113    -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \
    143     $(GDBM_INCLUDES)
     114    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
    144115LDFLAGS =
    145 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \
     116LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" \
    146117        "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \
    147118    $(SQLITE_LIBS)
Note: See TracChangeset for help on using the changeset viewer.