Ticket #134: patch1.patch

File patch1.patch, 9.7 KB (added by Charlie Hull, 18 years ago)

Patch to centralise list of libs

  • config.mak

     
    126126/D "HAVE_VSNPRINTF" /D "HAVE_STRDUP" /D "_USE_32BIT_TIME_T" \
    127127/D_CRT_SECURE_NO_DEPRECATE
    128128
     129# The various parts of Xapian
     130XAPIAN_LIBS = \
     131 "$(OUTLIBDIR)\libgetopt.lib"  \
     132 "$(OUTLIBDIR)\libcommon.lib"  \
     133 "$(OUTLIBDIR)\libbtreecheck.lib"  \
     134 "$(OUTLIBDIR)\libtest.lib"  \
     135 "$(OUTLIBDIR)\libbackend.lib"  \
     136 "$(OUTLIBDIR)\libquartz.lib" \
     137 "$(OUTLIBDIR)\libflint.lib" \
     138 "$(OUTLIBDIR)\libinmemory.lib" \
     139 "$(OUTLIBDIR)\libmulti.lib" \
     140 "$(OUTLIBDIR)\libmatcher.lib"  \
     141 "$(OUTLIBDIR)\libnet.lib" \
     142 "$(OUTLIBDIR)\liblanguages.lib"  \
     143 "$(OUTLIBDIR)\libapi.lib"  \
     144 "$(OUTLIBDIR)\libremote.lib"  \
     145 "$(OUTLIBDIR)\libunicode.lib"  \
     146 "$(OUTLIBDIR)\libqueryparser.lib" 
    129147
    130148!IF "$(DEBUG)" == "1"
    131149# Debug build

  • win32_applications_omega.mak

     
    125125CPP_OBJS=..\win32\$(XAPIAN_DEBUG_OR_RELEASE)
    126126CPP_SBRS=.
    127127
    128 LINK32=link.exe
    129 LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
    130  advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib \
    131  wsock32.lib odbccp32.lib /subsystem:console \
    132  "$(OUTLIBDIR)\libgetopt.lib"  \
    133  "$(OUTLIBDIR)\libcommon.lib"  \
    134  "$(OUTLIBDIR)\libbtreecheck.lib"  \
    135  "$(OUTLIBDIR)\libtest.lib"  \
    136  "$(OUTLIBDIR)\libbackend.lib"  \
    137  "$(OUTLIBDIR)\libquartz.lib" \
    138  "$(OUTLIBDIR)\libflint.lib" \
    139  "$(OUTLIBDIR)\libinmemory.lib" \
    140  "$(OUTLIBDIR)\libmulti.lib" \
    141  "$(OUTLIBDIR)\libmatcher.lib"  \
    142  "$(OUTLIBDIR)\liblanguages.lib"  \
    143  "$(OUTLIBDIR)\libapi.lib"  \
    144  "$(OUTLIBDIR)\libqueryparser.lib" 
     128ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS)
    145129
    146  
    147 
    148130PROGRAM_DEPENDENCIES =
    149131
    150132 # omega.exe
    … …  
    154136"$(OUTEXEDIR)\omega.exe" : "$(OUTEXEDIR)" $(DEF_FILE) $(OMEGA_OBJS)
    155137                      $(PROGRAM_DEPENDENCIES)
    156138    $(LINK32) @<<
    157   $(LINK32_FLAGS) /out:"$(OUTEXEDIR)\omega.exe" $(DEF_FLAGS) $(OMEGA_OBJS)
     139  $(ALL_LINK32_FLAGS) /out:"$(OUTEXEDIR)\omega.exe" $(DEF_FLAGS) $(OMEGA_OBJS)
    158140<<
    159141
    160142"$(OUTEXEDIR)\omindex.exe" : "$(OUTEXEDIR)" $(DEF_FILE) $(OMINDEX_OBJS)
    161143                      $(PROGRAM_DEPENDENCIES)
    162144    $(LINK32) @<<
    163   $(LINK32_FLAGS) /out:"$(OUTEXEDIR)\omindex.exe" $(DEF_FLAGS) $(OMINDEX_OBJS)
     145  $(ALL_LINK32_FLAGS) /out:"$(OUTEXEDIR)\omindex.exe" $(DEF_FLAGS) $(OMINDEX_OBJS)
    164146<<
    165147
    166148"$(OUTEXEDIR)\scriptindex.exe" : "$(OUTEXEDIR)" $(DEF_FILE) $(SCRIPTINDEX_OBJS)
    167149                      $(PROGRAM_DEPENDENCIES)
    168150    $(LINK32) @<<
    169   $(LINK32_FLAGS) /out:"$(OUTEXEDIR)\scriptindex.exe" $(DEF_FLAGS) $(SCRIPTINDEX_OBJS)
     151  $(ALL_LINK32_FLAGS) /out:"$(OUTEXEDIR)\scriptindex.exe" $(DEF_FLAGS) $(SCRIPTINDEX_OBJS)
    170152<<
    171153
    172154"$(OUTEXEDIR)\htmlparsetest.exe" : "$(OUTEXEDIR)" $(DEF_FILE) $(HTMLPARSETEST_OBJS)
    173155                      $(PROGRAM_DEPENDENCIES)
    174156    $(LINK32) @<<
    175   $(LINK32_FLAGS) /out:"$(OUTEXEDIR)\htmlparsetest.exe" $(DEF_FLAGS) $(HTMLPARSETEST_OBJS)
     157  $(ALL_LINK32_FLAGS) /out:"$(OUTEXEDIR)\htmlparsetest.exe" $(DEF_FLAGS) $(HTMLPARSETEST_OBJS)
    176158<<
    177159
    178160"$(OUTEXEDIR)\md5test.exe" : "$(OUTEXEDIR)" $(DEF_FILE) $(MD5TEST_OBJS)
    179161                      $(PROGRAM_DEPENDENCIES)
    180162    $(LINK32) @<<
    181   $(LINK32_FLAGS) /out:"$(OUTEXEDIR)\md5test.exe" $(DEF_FLAGS) $(MD5TEST_OBJS)
     163  $(ALL_LINK32_FLAGS) /out:"$(OUTEXEDIR)\md5test.exe" $(DEF_FLAGS) $(MD5TEST_OBJS)
    182164<<
    183165
    184166"$(OUTEXEDIR)\utf8test.exe" : "$(OUTEXEDIR)" $(DEF_FILE) $(UTF8TEST_OBJS)
    185167                      $(PROGRAM_DEPENDENCIES)
    186168    $(LINK32) @<<
    187   $(LINK32_FLAGS) /out:"$(OUTEXEDIR)\utf8test.exe" $(DEF_FLAGS) $(UTF8TEST_OBJS)
     169  $(ALL_LINK32_FLAGS) /out:"$(OUTEXEDIR)\utf8test.exe" $(DEF_FLAGS) $(UTF8TEST_OBJS)
    188170<<
    189171
    190172"$(INTDIR)\dirent.obj" : "$(XAPIAN_CORE_REL_OMEGA)\win32\dirent.c"

  • win32_bin.mak

     
    5656CPP_OBJS=..\win32\$(XAPIAN_DEBUG_OR_RELEASE)
    5757CPP_SBRS=.
    5858
    59 XAPIAN_LIBS= \
    60  "$(OUTLIBDIR)\libgetopt.lib"  \
    61  "$(OUTLIBDIR)\libcommon.lib"  \
    62  "$(OUTLIBDIR)\libbtreecheck.lib"  \
    63  "$(OUTLIBDIR)\libtest.lib"  \
    64  "$(OUTLIBDIR)\libbackend.lib"  \
    65  "$(OUTLIBDIR)\libquartz.lib" \
    66  "$(OUTLIBDIR)\libflint.lib" \
    67  "$(OUTLIBDIR)\libremote.lib" \
    68  "$(OUTLIBDIR)\libinmemory.lib" \
    69  "$(OUTLIBDIR)\libmulti.lib" \
    70  "$(OUTLIBDIR)\libmatcher.lib"  \
    71  "$(OUTLIBDIR)\liblanguages.lib"  \
    72  "$(OUTLIBDIR)\libapi.lib"  \
    73  "$(OUTLIBDIR)\libnet.lib"  \
    74  "$(OUTLIBDIR)\libqueryparser.lib" 
    75 
    7659ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS)
    7760 
    7861PROGRAM_DEPENDENCIES = $(XAPIAN_LIBS)

  • win32_bindings_php.mak

     
    1313
    1414!INCLUDE $(XAPIAN_CORE_REL_PHP)\win32\config.mak
    1515
    16 XAPIAN_DEPENDENCIES = \
    17  "$(OUTLIBDIR)\libgetopt.lib"  \
    18  "$(OUTLIBDIR)\libcommon.lib"  \
    19  "$(OUTLIBDIR)\libbtreecheck.lib"  \
    20  "$(OUTLIBDIR)\libtest.lib"  \
    21  "$(OUTLIBDIR)\libbackend.lib"  \
    22  "$(OUTLIBDIR)\libquartz.lib" \
    23  "$(OUTLIBDIR)\libflint.lib" \
    24  "$(OUTLIBDIR)\libinmemory.lib" \
    25  "$(OUTLIBDIR)\libmulti.lib" \
    26  "$(OUTLIBDIR)\libmatcher.lib"  \
    27  "$(OUTLIBDIR)\liblanguages.lib"  \
    28  "$(OUTLIBDIR)\libapi.lib"  \
    29  "$(OUTLIBDIR)\libqueryparser.lib" \
    30  "$(OUTLIBDIR)\libremote.lib" \
    31  "$(OUTLIBDIR)\libunicode.lib" \
    32  "$(OUTLIBDIR)\libnet.lib" \
    33  $(PHP_LIB)
    34 
    3516LIB_XAPIAN_OBJS= ".\xapian_wrap.obj"
    3617
    3718CPP=cl.exe
    … …  
    9374        $(SWIG) -I"$(XAPIAN_CORE_REL_PHP)\include" $(SWIG_FLAGS) -c++ -php5 -prefix Xapian \
    9475            -outdir php5 -o php5/xapian_wrap.cc $(srcdir)/../xapian.i
    9576
    96 ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_DEPENDENCIES)
     77ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS) $(PHP_LIB)
    9778
    9879
    99 "$(OUTDIR)\php_xapian.dll" : "$(OUTDIR)" $(DEF_FILE) $(LIB_XAPIAN_OBJS) \
    100                             $(XAPIAN_DEPENDENCIES)
     80"$(OUTDIR)\php_xapian.dll" : "$(OUTDIR)" $(DEF_FILE) $(LIB_XAPIAN_OBJS)
     81                           
    10182    $(LINK32) @<<
    10283  $(ALL_LINK32_FLAGS) /DLL /out:"$(OUTDIR)\php_xapian.dll" $(DEF_FLAGS) $(LIB_XAPIAN_OBJS)
    10384<<

  • win32_bindings_python.mak

     
    1414
    1515!INCLUDE $(XAPIAN_CORE_REL_PYTHON)\win32\config.mak
    1616
    17 XAPIAN_DEPENDENCIES = \
    18  "$(OUTLIBDIR)\libgetopt.lib"  \
    19  "$(OUTLIBDIR)\libcommon.lib"  \
    20  "$(OUTLIBDIR)\libbtreecheck.lib"  \
    21  "$(OUTLIBDIR)\libtest.lib"  \
    22  "$(OUTLIBDIR)\libbackend.lib"  \
    23  "$(OUTLIBDIR)\libquartz.lib" \
    24  "$(OUTLIBDIR)\libflint.lib" \
    25  "$(OUTLIBDIR)\libinmemory.lib" \
    26  "$(OUTLIBDIR)\libmulti.lib" \
    27  "$(OUTLIBDIR)\libmatcher.lib"  \
    28  "$(OUTLIBDIR)\liblanguages.lib"  \
    29  "$(OUTLIBDIR)\libapi.lib"  \
    30  "$(OUTLIBDIR)\libqueryparser.lib" \
    31  "$(OUTLIBDIR)\libremote.lib" \
    32  "$(OUTLIBDIR)\libunicode.lib" \
    33  "$(OUTLIBDIR)\libnet.lib"
    34 
    3517LIB_XAPIAN_OBJS= ".\xapian_wrap.obj"
    3618
    37 
    3819OUTDIR=$(XAPIAN_CORE_REL_PYTHON)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\Python
    3920INTDIR=.\
    4021
    … …  
    8263CPP_OBJS=$(XAPIAN_CORE_REL_PYTHON)\win32\$(XAPIAN_DEBUG_OR_RELEASE)\
    8364CPP_SBRS=.
    8465
    85 ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_DEPENDENCIES) "/LIBPATH:$(PYTHON_LIB_DIR)"
     66ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS) "/LIBPATH:$(PYTHON_LIB_DIR)"
    8667
    8768modern/xapian_wrap.cc modern/xapian_wrap.h modern/xapian.py: ../xapian.i util.i except.i doccomments.i extra.i extracomments.i
    8869        -erase /Q modern
    … …  
    9374        -erase modern\xapian.py
    9475        -rename modern\xapian_py.tmp xapian.py
    9576
    96 "$(OUTDIR)\_xapian$(PY_DEBUG_SUFFIX).pyd" : "$(OUTDIR)" $(DEF_FILE) $(LIB_XAPIAN_OBJS) \
    97                             $(XAPIAN_DEPENDENCIES)
     77"$(OUTDIR)\_xapian$(PY_DEBUG_SUFFIX).pyd" : "$(OUTDIR)" $(DEF_FILE) $(LIB_XAPIAN_OBJS)
     78                           
    9879    $(LINK32) @<<
    9980  $(ALL_LINK32_FLAGS) /DLL /out:"$(OUTDIR)\_xapian$(PY_DEBUG_SUFFIX).pyd" $(DEF_FLAGS) $(LIB_XAPIAN_OBJS)
    10081<<

  • win32_examples.mak

     
    4848CPP_SBRS=.
    4949
    5050
    51 XAPIAN_LIBS = \
    52  "$(OUTLIBDIR)\libgetopt.lib"  \
    53  "$(OUTLIBDIR)\libcommon.lib"  \
    54  "$(OUTLIBDIR)\libbtreecheck.lib"  \
    55  "$(OUTLIBDIR)\libtest.lib"  \
    56  "$(OUTLIBDIR)\libbackend.lib"  \
    57  "$(OUTLIBDIR)\libquartz.lib" \
    58  "$(OUTLIBDIR)\libflint.lib" \
    59  "$(OUTLIBDIR)\libinmemory.lib" \
    60  "$(OUTLIBDIR)\libmulti.lib" \
    61  "$(OUTLIBDIR)\libmatcher.lib"  \
    62  "$(OUTLIBDIR)\liblanguages.lib"  \
    63  "$(OUTLIBDIR)\libapi.lib"  \
    64  "$(OUTLIBDIR)\libnet.lib"  \
    65  "$(OUTLIBDIR)\libremote.lib"  \
    66  "$(OUTLIBDIR)\libunicode.lib"  \
    67  "$(OUTLIBDIR)\libqueryparser.lib" 
    68 
    6951ALL_LINK32_FLAGS = $(LINK32_FLAGS) $(XAPIAN_LIBS)
    7052
    7153PROGRAM_DEPENDENCIES = $(XAPIAN_LIBS)

  • win32_tests.mak

     
    9797CPP_OBJS=..\win32\Tests$(XAPIAN_DEBUG_OR_RELEASE)
    9898CPP_SBRS=.
    9999
    100 XAPIAN_LIBS = \
    101  "$(OUTLIBDIR)\libgetopt.lib"  \
    102  "$(OUTLIBDIR)\libcommon.lib"  \
    103  "$(OUTLIBDIR)\libbtreecheck.lib"  \
    104  "$(OUTLIBDIR)\libtest.lib"  \
    105  "$(OUTLIBDIR)\libbackend.lib"  \
    106  "$(OUTLIBDIR)\libquartz.lib" \
    107  "$(OUTLIBDIR)\libflint.lib" \
    108  "$(OUTLIBDIR)\libinmemory.lib" \
    109  "$(OUTLIBDIR)\libmulti.lib" \
    110  "$(OUTLIBDIR)\libmatcher.lib"  \
    111  "$(OUTLIBDIR)\libnet.lib" \
    112  "$(OUTLIBDIR)\liblanguages.lib"  \
    113  "$(OUTLIBDIR)\libapi.lib"  \
    114  "$(OUTLIBDIR)\libremote.lib"  \
    115  "$(OUTLIBDIR)\libunicode.lib"  \
    116  "$(OUTLIBDIR)\libqueryparser.lib" 
    117100
     101
    118102LINK32=link.exe
    119103ALL_LINK32_FLAGS=$(LINK32_FLAGS) $(XAPIAN_LIBS)
    120104