Changeset 13759 for branches


Ignore:
Timestamp:
2007-01-23T16:32:20+13:00 (17 years ago)
Author:
kjdon
Message:

changes for new indexers repository, and new names for soem of mg/mgpp libraries

Location:
branches/changing-indexers-branch/gsdl/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/changing-indexers-branch/gsdl/src/colservr/win32.mak

    r11257 r13759  
    5252DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE
    5353INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \
    54        -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\packages\mg" \
    55        -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg\src\text" \
     54       -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\indexers\mg" \
     55       -I"$(GSDLHOME)\indexers\mg\lib" -I"$(GSDLHOME)\indexers\mg\src\text" \
    5656       -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
    57            -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)\src\mgpp\text" \
     57           -I"$(GSDLHOME)\indexers\mgpp\lib" -I"$(GSDLHOME)\indexers\mgpp\text" \
    5858           -I"$(GSDLHOME)\packages\windows\expat\expat"
    5959

  • branches/changing-indexers-branch/gsdl/src/db2txt/win32.mak

    r11257 r13759  
    4848!ENDIF
    4949
    50 LIBS = "$(GSDLHOME)\packages\mg\lib\unitool.obj" "$(GSDLHOME)\lib\gsdllib.lib" \
     50LIBS = "$(GSDLHOME)\indexers\mg\lib\unitool.obj" "$(GSDLHOME)\lib\gsdllib.lib" \
    5151       "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
    5252

  • branches/changing-indexers-branch/gsdl/src/oaiservr/win32.mak

    r12990 r13759  
    5757DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    5858INCLUDES = -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \
    59        -I"$(GSDLHOME)\packages\mg" -I"$(GSDLHOME)\packages\mg\lib" \
    60        -I"$(GSDLHOME)\packages\mg\src\text" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
    61        -I"$(GSDLHOME)\packages\windows\crypt\crypt" -I"$(GSDLHOME)\src\mgpp\lib" \
    62        -I"$(GSDLHOME)\src\mgpp\text" -I"$(GSDLHOME)"
     59       -I"$(GSDLHOME)\indexers\mg" -I"$(GSDLHOME)\indexers\mg\lib" \
     60       -I"$(GSDLHOME)\indexers\mg\src\text" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
     61       -I"$(GSDLHOME)\packages\windows\crypt\crypt" -I"$(GSDLHOME)\indexers\mgpp\lib" \
     62       -I"$(GSDLHOME)\indexers\mgpp\text" -I"$(GSDLHOME)"
    6363!IF $(GSDL_VC4)
    6464DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    … …  
    6767
    6868!IF $(ENABLE_ACCENTFOLD)
    69 AFLIBS = "$(GSDLHOME)\packages\unac\libunac.lib" "$(GSDLHOME)\packages\unac\iconv.lib"
     69AFLIBS = "$(GSDLHOME)\indexers\packages\unac\libunac.lib" "$(GSDLHOME)\indexers\packages\unac\iconv.lib"
    7070DEFS = $(DEFS) -DENABLE_ACCENTFOLD
    7171!ELSE
    … …  
    7777       "$(GSDLHOME)\src\colservr\gsdlcolservr.lib" \
    7878       "$(GSDLHOME)\lib\gsdllib.lib" \
    79        "$(GSDLHOME)\packages\mg\src\text\libtextin.lib" \
    80        "$(GSDLHOME)\packages\mg\lib\libmg.lib" \
    81        "$(GSDLHOME)\src\mgpp\text\libtextin.lib" \
    82        "$(GSDLHOME)\src\mgpp\lib\libmg.lib" \
     79       "$(GSDLHOME)\indexers\mg\src\text\libmgtext.lib" \
     80       "$(GSDLHOME)\indexers\mg\lib\libmglib.lib" \
     81       "$(GSDLHOME)\indexers\mgpp\text\libmgpptext.lib" \
     82       "$(GSDLHOME)\indexers\mgpp\lib\libmgpplib.lib" \
    8383       "$(GSDLHOME)\packages\windows\expat\expat\libexpat.lib" \
    8484    $(AFLIBS)

  • branches/changing-indexers-branch/gsdl/src/recpt/Makefile.in

    r13721 r13759  
    319319    ../../lib/gsdllib.a  \
    320320    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
    321     $(INDEXERS_DIR)/mg/lib/libmg.a \
     321    $(INDEXERS_DIR)/mg/lib/libmglib.a \
    322322    $(FASTCGI_OBJS) \
    323323    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    … …  
    338338    ../../lib/gsdllib.a  \
    339339    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
    340     $(INDEXERS_DIR)/mg/lib/libmg.a \
     340    $(INDEXERS_DIR)/mg/lib/libmglib.a \
    341341    $(FASTCGI_OBJS) $(Z_LIBYAZ_A) \
    342342    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    … …  
    355355    ../../lib/gsdllib.a  \
    356356    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
    357     $(INDEXERS_DIR)/mg/lib/libmg.a \
     357    $(INDEXERS_DIR)/mg/lib/libmglib.a \
    358358    $(FASTCGI_OBJS) $(Z_LIBOBJS) $(Z_LIBYAZ_A) \
    359359    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    … …  
    381381    ../../lib/gsdllib.a  \
    382382    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
    383     $(INDEXERS_DIR)/mg/lib/libmg.a \
     383    $(INDEXERS_DIR)/mg/lib/libmglib.a \
    384384    $(FASTCGI_OBJS) \
    385385    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    … …  
    400400    ../../lib/gsdllib.a  \
    401401    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
    402     $(INDEXERS_DIR)/mg/lib/libmg.a \
     402    $(INDEXERS_DIR)/mg/lib/libmglib.a \
    403403    $(FASTCGI_OBJS) \
    404404    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \

  • branches/changing-indexers-branch/gsdl/src/recpt/win32.mak

    r12990 r13759  
    5959DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE -DGSDL_NOCACHE
    6060INCLUDES = -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \
    61        -I"$(GSDLHOME)\packages\mg" -I"$(GSDLHOME)\packages\mg\lib" \
    62        -I"$(GSDLHOME)\packages\mg\src\text" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
    63        -I"$(GSDLHOME)\packages\windows\crypt\crypt" -I"$(GSDLHOME)\src\mgpp\lib" \
    64        -I"$(GSDLHOME)\src\mgpp\text" -I"$(GSDLHOME)"
     61       -I"$(GSDLHOME)\indexers\mg" -I"$(GSDLHOME)\indexers\mg\lib" \
     62       -I"$(GSDLHOME)\indexers\mg\src\text" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
     63       -I"$(GSDLHOME)\packages\windows\crypt\crypt" -I"$(GSDLHOME)\indexers\mgpp\lib" \
     64       -I"$(GSDLHOME)\indexers\mgpp\text" -I"$(GSDLHOME)"
    6565!IF $(GSDL_VC4)
    6666DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    … …  
    7272
    7373!IF $(ENABLE_ACCENTFOLD)
    74 AFLIBS = "$(GSDLHOME)\packages\unac\libunac.lib" "$(GSDLHOME)\packages\unac\iconv.lib"
     74AFLIBS = "$(GSDLHOME)\indexers\packages\unac\libunac.lib" "$(GSDLHOME)\indexers\packages\unac\iconv.lib"
    7575DEFS = $(DEFS) -DENABLE_ACCENTFOLD
    7676!ELSE
    … …  
    8282       "$(GSDLHOME)\src\colservr\gsdlcolservr.lib" \
    8383       "$(GSDLHOME)\lib\gsdllib.lib" \
    84        "$(GSDLHOME)\packages\mg\src\text\libtextin.lib" \
    85        "$(GSDLHOME)\packages\mg\lib\libmg.lib" \
    86        "$(GSDLHOME)\src\mgpp\text\libtextin.lib" \
    87        "$(GSDLHOME)\src\mgpp\lib\libmg.lib" \
     84       "$(GSDLHOME)\indexers\mg\src\text\libmgtext.lib" \
     85       "$(GSDLHOME)\indexers\mg\lib\libmglib.lib" \
     86       "$(GSDLHOME)\indexers\mgpp\text\libmgpptext.lib" \
     87       "$(GSDLHOME)\indexers\mgpp\lib\libmgpplib.lib" \
    8888       "$(GSDLHOME)\packages\windows\expat\expat\libexpat.lib" \
    8989    $(AFLIBS)
    … …  
    206206    ../colservr/z3950server.o ../colservr/read-grs.o nullproto.o \
    207207    ../../lib/gsdllib.a  \
    208     ../../packages/mg/src/text/libtextin.a \
    209     ../../packages/mg/lib/libmg.a \
     208    ../../indexers/mg/src/text/libmgtext.a \
     209    ../../indexers/mg/lib/libmglib.a \
    210210    $(FASTCGI_OBJS) \
    211     ../mgpp/text/libtextin.a \
    212     ../mgpp/lib/libmg.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
     211    ../../indexers/mgpp/text/libmgpptext.a \
     212    ../../indexers/mgpp/lib/libmgpplib.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
    213213
    214214Z3950_OBJS =  "$(GSDLHOME)\src\colservr\gsdlz3950.lib" \

  • branches/changing-indexers-branch/gsdl/src/txt2db/win32.mak

    r11257 r13759  
    4141
    4242DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE
    43 INCLUDES = -I"$(GSDLHOME)\src\txt2db" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\packages\mg\lib" \
     43INCLUDES = -I"$(GSDLHOME)\src\txt2db" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\indexers\mg\lib" \
    4444       -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
    4545!IF $(GSDL_VC4)
    … …  
    4848!ENDIF
    4949
    50 LIBS = "$(GSDLHOME)\packages\mg\lib\unitool.obj" "$(GSDLHOME)\lib\gsdllib.lib" \
     50LIBS = "$(GSDLHOME)\indexers\mg\lib\unitool.obj" "$(GSDLHOME)\lib\gsdllib.lib" \
    5151       "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
    5252

  • branches/changing-indexers-branch/gsdl/src/w32server/win32.mak

    r12998 r13759  
    4444       -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    4545INCLUDES = -I"$(GSDLHOME)\src\w32server" -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\lib" \
    46        -I"$(GSDLHOME)\src\colservr" -I"$(GSDLHOME)\packages\mg" \
    47        -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg\src\text" \
    48        -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)\src\mgpp\text" -I"$(GSDLHOME)"
     46       -I"$(GSDLHOME)\src\colservr" -I"$(GSDLHOME)\indexers\mg" \
     47       -I"$(GSDLHOME)\indexers\mg\lib" -I"$(GSDLHOME)\indexers\mg\src\text" \
     48       -I"$(GSDLHOME)\indexers\mgpp\lib" -I"$(GSDLHOME)\indexers\mgpp\text" -I"$(GSDLHOME)"
    4949!IF $(GSDL_VC4)
    5050DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    … …  
    5353
    5454!IF $(ENABLE_ACCENTFOLD)
    55 AFLIBS = "$(GSDLHOME)\packages\unac\libunac.lib" "$(GSDLHOME)\packages\unac\iconv.lib"
     55AFLIBS = "$(GSDLHOME)\indexers\packages\unac\libunac.lib" "$(GSDLHOME)\indexers\packages\unac\iconv.lib"
    5656DEFS = $(DEFS) -DENABLE_ACCENTFOLD
    5757!ELSE
    … …  
    6060
    6161LIBS = "$(GSDLHOME)\lib\gsdllib.lib" \
    62        "$(GSDLHOME)\packages\mg\src\text\libtextin.lib" \
    63        "$(GSDLHOME)\packages\mg\lib\libmg.lib" \
     62       "$(GSDLHOME)\indexers\mg\src\text\libmgtext.lib" \
     63       "$(GSDLHOME)\indexers\mg\lib\libmglib.lib" \
    6464       "$(GSDLHOME)\src\colservr\gsdlcolservr.lib" \
    6565       "$(GSDLHOME)\src\recpt\gsdlrecpt.lib" \
    6666       "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib" \
    6767       "$(GSDLHOME)\packages\windows\crypt\crypt\crypt.lib" \
    68        "$(GSDLHOME)\src\mgpp\lib\libmg.lib" \
    69        "$(GSDLHOME)\src\mgpp\text\libtextin.lib" \
     68       "$(GSDLHOME)\indexers\mgpp\lib\libmgpplib.lib" \
     69       "$(GSDLHOME)\indexers\mgpp\text\libmgpptext.lib" \
    7070       "$(GSDLHOME)\packages\windows\expat\expat\libexpat.lib" \
    7171    $(AFLIBS)
Note: See TracChangeset for help on using the changeset viewer.