Changeset 13721


Ignore:
Timestamp:
2007-01-22T16:38:58+13:00 (15 years ago)
Author:
kjdon
Message:

mg, mgpp, unac now come from external repository which is checked out into gsdl/indexers. so had to change all the paths for includes and links

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

Legend:

Unmodified
Added
Removed
  • branches/changing-indexers-branch/gsdl/src/colservr/Makefile.in

    r10176 r13721  
    3434DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
    3535
     36INDEXERS_DIR=../../indexers
    3637USE_FASTCGI = @USE_FASTCGI@
    3738USE_MGPP = @USE_MGPP@
     
    4748
    4849ifneq ($(USE_MGPP), 1)
    49 MG_INCLUDES = -I../../packages/mg  -I../../packages/mg/lib \
    50         -I../../packages/mg/src/text
     50MG_INCLUDES = -I$(INDEXERS_DIR)/mg  -I$(INDEXERS_DIR)/mg/lib \
     51        -I$(INDEXERS_DIR)/mg/src/text
    5152MG_HEADERS = mgq.h mgsearch.h mgqueryfilter.h
    5253
     
    5758
    5859else
    59 MG_INCLUDES = -I../mgpp/text -I../mgpp/lib
     60MG_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib
    6061
    6162MG_HEADERS = mgppsearch.h mgppqueryfilter.h
     
    9293endif
    9394endif
    94 MINCLUDES = -I. -I../../lib -I../recpt  -I../mgpp/text $(MICO_INC)
     95MINCLUDES = -I. -I../../lib -I../recpt  -I$(INDEXERS_DIR)/mgpp/text $(MICO_INC)
    9596
    9697USE_CORBA = @USE_CORBA@
     
    185186# needs IndexData.h from mgpp...
    186187$(MG_MGPP_OBJECTS): %.o : %.cpp
    187     $(CXXCOMPILE) -I../mgpp/text -I../mgpp/lib -o $@ $<
     188    $(CXXCOMPILE) -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib -o $@ $<
    188189
    189190depend:
  • branches/changing-indexers-branch/gsdl/src/oaiservr/Makefile.in

    r12927 r13721  
    3131colserv_srcdir = $(gs_srcdir)/colservr
    3232
     33INDEXERS_DIR=../../indexers
     34
    3335ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@
    3436ifeq ($(ENABLE_ACCENTFOLD), 1)
    35 AFLIBS = ../../packages/unac/libunac.a
     37AFLIBS = $(INDEXERS_DIR)/packages/unac/libunac.a
    3638AFFLAGS = -DENABLE_ACCENTFOLD
    3739else
     
    4951
    5052# -I../../packages/mg -I../../packages/mg/lib -I../../packages/mg/src/text ?
    51 INCLUDES = -I$(srcdir)/../../lib -I$(colserv_srcdir) -I$(gs_srcdir)/mgpp/lib -I$(gs_srcdir)/mgpp/text -I$(recpt_srcdir)
     53INCLUDES = -I$(srcdir)/../../lib -I$(colserv_srcdir) -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text -I$(recpt_srcdir)
    5254
    5355
     
    153155OAI_OBJS = $(OBJECTS) $(COLSERVROBJECTS) \
    154156    ../../lib/gsdllib.a  \
    155     ../../packages/mg/src/text/libtextin.a \
    156     ../../packages/mg/lib/libmg.a \
    157     ../../src/mgpp/text/libtextin.a \
    158     ../../src/mgpp/lib/libmg.a
     157    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
     158    $(INDEXERS_DIR)/mg/lib/libmg.a \
     159    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     160    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
    159161
    160162oaiserver$(EXEEXT): $(OAI_OBJS)
  • branches/changing-indexers-branch/gsdl/src/recpt/Makefile.in

    r12926 r13721  
    3939endif
    4040
     41INDEXERS_DIR=../../indexers
     42
    4143ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@
    4244ifeq ($(ENABLE_ACCENTFOLD), 1)
    43 AFLIBS = ../../packages/unac/libunac.a
     45AFLIBS = $(INDEXERSDIR)/packages/unac/libunac.a
    4446AFFLAGS = -DENABLE_ACCENTFOLD
    4547else
     
    6163ifneq ($(USE_FASTCGI), 1)
    6264DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM @DEFS@
    63 INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
    64        -I../../packages/mg/lib -I../../packages/mg/src/text \
     65INCLUDES = -I../../lib -I. -I../colservr -I$(INDEXERS_DIR)/mg \
     66       -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
    6567           -I../../packages/expat/include \
    66        -I../mgpp/lib -I../mgpp/text -I../..
     68       -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text -I../..
    6769else
    6870DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@
    69 INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
    70        -I../../packages/mg/lib -I../../packages/mg/src/text \
     71INCLUDES = -I../../lib -I. -I../colservr -I$(INDEXERS_DIR)/mg \
     72       -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
    7173           -I../../packages/expat/include \
    72            -I../../packages/fcgi/include -I../mgpp/lib \
    73        -I../mgpp/text -I../..
     74           -I../../packages/fcgi/include -I$(INDEXERS_DIR)/mgpp/lib \
     75       -I$(INDEXERS_DIR)/mgpp/text -I../..
    7476endif
    7577MICO_DIR = @MICO_DIR@
     
    8991MICO_LIB = -L$(MICO_DIR)
    9092endif
    91 MINCLUDES = -I. -I../../lib -I../colservr -I../mgpp/text $(MICO_INC)
     93MINCLUDES = -I. -I../../lib -I../colservr -I$(INDEXERS_DIR)/mgpp/text $(MICO_INC)
    9294
    9395LC_LIBS     = -L../../packages/expat/lib -lexpat
     
    316318RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
    317319    ../../lib/gsdllib.a  \
    318     ../../packages/mg/src/text/libtextin.a \
    319     ../../packages/mg/lib/libmg.a \
     320    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
     321    $(INDEXERS_DIR)/mg/lib/libmg.a \
    320322    $(FASTCGI_OBJS) \
    321     ../mgpp/text/libtextin.a \
    322     ../mgpp/lib/libmg.a
     323    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     324    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
    323325
    324326recpt: $(RECPT_OBJS)
     
    335337LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) $(Z_CLIENTOBJS) \
    336338    ../../lib/gsdllib.a  \
    337     ../../packages/mg/src/text/libtextin.a \
    338     ../../packages/mg/lib/libmg.a \
     339    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
     340    $(INDEXERS_DIR)/mg/lib/libmg.a \
    339341    $(FASTCGI_OBJS) $(Z_LIBYAZ_A) \
    340     ../mgpp/text/libtextin.a \
    341     ../mgpp/lib/libmg.a
     342    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     343    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
    342344
    343345library: $(LIBRARY_OBJS)
     
    352354RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \
    353355    ../../lib/gsdllib.a  \
    354     ../../packages/mg/src/text/libtextin.a \
    355     ../../packages/mg/lib/libmg.a \
     356    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
     357    $(INDEXERS_DIR)/mg/lib/libmg.a \
    356358    $(FASTCGI_OBJS) $(Z_LIBOBJS) $(Z_LIBYAZ_A) \
    357     ../mgpp/text/libtextin.a \
    358     ../mgpp/lib/libmg.a
     359    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     360    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
    359361
    360362RECPTLIB_OBJS = $(RLIBRARY_OBJS) ../colservr/corbaServer.o
     
    378380    ../../lib/corbatext_t.o \
    379381    ../../lib/gsdllib.a  \
    380     ../../packages/mg/src/text/libtextin.a \
    381     ../../packages/mg/lib/libmg.a \
     382    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
     383    $(INDEXERS_DIR)/mg/lib/libmg.a \
    382384    $(FASTCGI_OBJS) \
    383     ../mgpp/text/libtextin.a \
    384     ../mgpp/lib/libmg.a
     385    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     386    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
    385387
    386388
     
    397399    ../colservr/z3950server.o ../colservr/read-grs.o nullproto.o \
    398400    ../../lib/gsdllib.a  \
    399     ../../packages/mg/src/text/libtextin.a \
    400     ../../packages/mg/lib/libmg.a \
     401    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
     402    $(INDEXERS_DIR)/mg/lib/libmg.a \
    401403    $(FASTCGI_OBJS) \
    402     ../mgpp/text/libtextin.a \
    403     ../mgpp/lib/libmg.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
     404    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     405    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
    404406
    405407
  • branches/changing-indexers-branch/gsdl/src/txt2db/Makefile.in

    r7265 r13721  
    3535INCLUDES = -I../../lib @GDBM_INCLUDE@
    3636LDFLAGS = @LDFLAGS@
    37 DPLIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o
    38 LIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o @GDBM_LIBPATH@ -lgdbm @LIBS@
     37INDEXERS_DIR=../../indexers
     38DPLIBS = ../../lib/gsdllib.a $(INDEXERS_DIR)/mg/lib/unitool.o
     39LIBS = ../../lib/gsdllib.a $(INDEXERS_DIR)/mg/lib/unitool.o @GDBM_LIBPATH@ -lgdbm @LIBS@
    3940GSDLOS = @gsdlos@
    4041INSTALL = @INSTALL@
Note: See TracChangeset for help on using the changeset viewer.