Changeset 13721
- Timestamp:
- 2007-01-22T16:38:58+13:00 (17 years ago)
- 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 34 34 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@ 35 35 36 INDEXERS_DIR=../../indexers 36 37 USE_FASTCGI = @USE_FASTCGI@ 37 38 USE_MGPP = @USE_MGPP@ … … 47 48 48 49 ifneq ($(USE_MGPP), 1) 49 MG_INCLUDES = -I ../../packages/mg -I../../packages/mg/lib \50 -I ../../packages/mg/src/text50 MG_INCLUDES = -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib \ 51 -I$(INDEXERS_DIR)/mg/src/text 51 52 MG_HEADERS = mgq.h mgsearch.h mgqueryfilter.h 52 53 … … 57 58 58 59 else 59 MG_INCLUDES = -I ../mgpp/text -I../mgpp/lib60 MG_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib 60 61 61 62 MG_HEADERS = mgppsearch.h mgppqueryfilter.h … … 92 93 endif 93 94 endif 94 MINCLUDES = -I. -I../../lib -I../recpt -I ../mgpp/text $(MICO_INC)95 MINCLUDES = -I. -I../../lib -I../recpt -I$(INDEXERS_DIR)/mgpp/text $(MICO_INC) 95 96 96 97 USE_CORBA = @USE_CORBA@ … … 185 186 # needs IndexData.h from mgpp... 186 187 $(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 $@ $< 188 189 189 190 depend: -
branches/changing-indexers-branch/gsdl/src/oaiservr/Makefile.in
r12927 r13721 31 31 colserv_srcdir = $(gs_srcdir)/colservr 32 32 33 INDEXERS_DIR=../../indexers 34 33 35 ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 34 36 ifeq ($(ENABLE_ACCENTFOLD), 1) 35 AFLIBS = ../../packages/unac/libunac.a37 AFLIBS = $(INDEXERS_DIR)/packages/unac/libunac.a 36 38 AFFLAGS = -DENABLE_ACCENTFOLD 37 39 else … … 49 51 50 52 # -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)53 INCLUDES = -I$(srcdir)/../../lib -I$(colserv_srcdir) -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text -I$(recpt_srcdir) 52 54 53 55 … … 153 155 OAI_OBJS = $(OBJECTS) $(COLSERVROBJECTS) \ 154 156 ../../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.a157 $(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 159 161 160 162 oaiserver$(EXEEXT): $(OAI_OBJS) -
branches/changing-indexers-branch/gsdl/src/recpt/Makefile.in
r12926 r13721 39 39 endif 40 40 41 INDEXERS_DIR=../../indexers 42 41 43 ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 42 44 ifeq ($(ENABLE_ACCENTFOLD), 1) 43 AFLIBS = ../../packages/unac/libunac.a45 AFLIBS = $(INDEXERSDIR)/packages/unac/libunac.a 44 46 AFFLAGS = -DENABLE_ACCENTFOLD 45 47 else … … 61 63 ifneq ($(USE_FASTCGI), 1) 62 64 DEFS = -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 \65 INCLUDES = -I../../lib -I. -I../colservr -I$(INDEXERS_DIR)/mg \ 66 -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \ 65 67 -I../../packages/expat/include \ 66 -I ../mgpp/lib -I../mgpp/text -I../..68 -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text -I../.. 67 69 else 68 70 DEFS = -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 \71 INCLUDES = -I../../lib -I. -I../colservr -I$(INDEXERS_DIR)/mg \ 72 -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \ 71 73 -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../.. 74 76 endif 75 77 MICO_DIR = @MICO_DIR@ … … 89 91 MICO_LIB = -L$(MICO_DIR) 90 92 endif 91 MINCLUDES = -I. -I../../lib -I../colservr -I ../mgpp/text $(MICO_INC)93 MINCLUDES = -I. -I../../lib -I../colservr -I$(INDEXERS_DIR)/mgpp/text $(MICO_INC) 92 94 93 95 LC_LIBS = -L../../packages/expat/lib -lexpat … … 316 318 RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \ 317 319 ../../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 \ 320 322 $(FASTCGI_OBJS) \ 321 ../mgpp/text/libtextin.a \322 ../mgpp/lib/libmg.a323 $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 324 $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 323 325 324 326 recpt: $(RECPT_OBJS) … … 335 337 LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) $(Z_CLIENTOBJS) \ 336 338 ../../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 \ 339 341 $(FASTCGI_OBJS) $(Z_LIBYAZ_A) \ 340 ../mgpp/text/libtextin.a \341 ../mgpp/lib/libmg.a342 $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 343 $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 342 344 343 345 library: $(LIBRARY_OBJS) … … 352 354 RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \ 353 355 ../../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 \ 356 358 $(FASTCGI_OBJS) $(Z_LIBOBJS) $(Z_LIBYAZ_A) \ 357 ../mgpp/text/libtextin.a \358 ../mgpp/lib/libmg.a359 $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 360 $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 359 361 360 362 RECPTLIB_OBJS = $(RLIBRARY_OBJS) ../colservr/corbaServer.o … … 378 380 ../../lib/corbatext_t.o \ 379 381 ../../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 \ 382 384 $(FASTCGI_OBJS) \ 383 ../mgpp/text/libtextin.a \384 ../mgpp/lib/libmg.a385 $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 386 $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 385 387 386 388 … … 397 399 ../colservr/z3950server.o ../colservr/read-grs.o nullproto.o \ 398 400 ../../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 \ 401 403 $(FASTCGI_OBJS) \ 402 ../mgpp/text/libtextin.a \403 ../mgpp/lib/libmg.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a404 $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 405 $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a 404 406 405 407 -
branches/changing-indexers-branch/gsdl/src/txt2db/Makefile.in
r7265 r13721 35 35 INCLUDES = -I../../lib @GDBM_INCLUDE@ 36 36 LDFLAGS = @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@ 37 INDEXERS_DIR=../../indexers 38 DPLIBS = ../../lib/gsdllib.a $(INDEXERS_DIR)/mg/lib/unitool.o 39 LIBS = ../../lib/gsdllib.a $(INDEXERS_DIR)/mg/lib/unitool.o @GDBM_LIBPATH@ -lgdbm @LIBS@ 39 40 GSDLOS = @gsdlos@ 40 41 INSTALL = @INSTALL@
Note:
See TracChangeset
for help on using the changeset viewer.