Changeset 13721 for branches/changing-indexers-branch/gsdl/src/recpt/Makefile.in

Timestamp:

2007-01-22T16:38:58+13:00 (17 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

File:

• branches/changing-indexers-branch/gsdl/src/recpt/Makefile.in (modified) (8 diffs)

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

@@ -39 +39 @@
 endif
 
+INDEXERS_DIR=../../indexers
+
 ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@
 ifeq ($(ENABLE_ACCENTFOLD), 1)
-AFLIBS = ../../packages/unac/libunac.a 
+AFLIBS = $(INDEXERSDIR)/packages/unac/libunac.a 
 AFFLAGS = -DENABLE_ACCENTFOLD
 else
@@ -61 +63 @@
 ifneq ($(USE_FASTCGI), 1)
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM @DEFS@
-INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
-       -I../../packages/mg/lib -I../../packages/mg/src/text \
+INCLUDES = -I../../lib -I. -I../colservr -I$(INDEXERS_DIR)/mg \
+       -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
            -I../../packages/expat/include \
-       -I../mgpp/lib -I../mgpp/text -I../..
+       -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text -I../..
 else 
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@
-INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
-       -I../../packages/mg/lib -I../../packages/mg/src/text \
+INCLUDES = -I../../lib -I. -I../colservr -I$(INDEXERS_DIR)/mg \
+       -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
            -I../../packages/expat/include \
-           -I../../packages/fcgi/include -I../mgpp/lib \
-       -I../mgpp/text -I../..
+           -I../../packages/fcgi/include -I$(INDEXERS_DIR)/mgpp/lib \
+       -I$(INDEXERS_DIR)/mgpp/text -I../..
 endif
 MICO_DIR = @MICO_DIR@
@@ -89 +91 @@
 MICO_LIB = -L$(MICO_DIR)
 endif
-MINCLUDES = -I. -I../../lib -I../colservr -I../mgpp/text $(MICO_INC)
+MINCLUDES = -I. -I../../lib -I../colservr -I$(INDEXERS_DIR)/mgpp/text $(MICO_INC)
 
 LC_LIBS     = -L../../packages/expat/lib -lexpat
@@ -316 +318 @@
 RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
     ../../lib/gsdllib.a  \
-    ../../packages/mg/src/text/libtextin.a \
-    ../../packages/mg/lib/libmg.a \
+    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
+    $(INDEXERS_DIR)/mg/lib/libmg.a \
     $(FASTCGI_OBJS) \
-    ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a 
+    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
+    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 
 
 recpt: $(RECPT_OBJS)
@@ -335 +337 @@
 LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) $(Z_CLIENTOBJS) \
     ../../lib/gsdllib.a  \
-    ../../packages/mg/src/text/libtextin.a \
-    ../../packages/mg/lib/libmg.a \
+    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
+    $(INDEXERS_DIR)/mg/lib/libmg.a \
     $(FASTCGI_OBJS) $(Z_LIBYAZ_A) \
-    ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a
+    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
+    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
 
 library: $(LIBRARY_OBJS)
@@ -352 +354 @@
 RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \
     ../../lib/gsdllib.a  \
-    ../../packages/mg/src/text/libtextin.a \
-    ../../packages/mg/lib/libmg.a \
+    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
+    $(INDEXERS_DIR)/mg/lib/libmg.a \
     $(FASTCGI_OBJS) $(Z_LIBOBJS) $(Z_LIBYAZ_A) \
-    ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a 
+    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
+    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 
 
 RECPTLIB_OBJS = $(RLIBRARY_OBJS) ../colservr/corbaServer.o
@@ -378 +380 @@
     ../../lib/corbatext_t.o \
     ../../lib/gsdllib.a  \
-    ../../packages/mg/src/text/libtextin.a \
-    ../../packages/mg/lib/libmg.a \
+    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
+    $(INDEXERS_DIR)/mg/lib/libmg.a \
     $(FASTCGI_OBJS) \
-    ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a 
+    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
+    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 
 
 
@@ -397 +399 @@
     ../colservr/z3950server.o ../colservr/read-grs.o nullproto.o \
     ../../lib/gsdllib.a  \
-    ../../packages/mg/src/text/libtextin.a \
-    ../../packages/mg/lib/libmg.a \
+    $(INDEXERS_DIR)/mg/src/text/libtextin.a \
+    $(INDEXERS_DIR)/mg/lib/libmg.a \
     $(FASTCGI_OBJS) \
-    ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
+    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
+    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a