Changeset 15425

Show
Ignore:
Timestamp:
13.05.2008 17:06:17 (11 years ago)
Author:
mdewsnip
Message:

(Untangling colservr/recpt) Moved all the z3950 files out of "colservr" and into "recpt".

Location:
gsdl/trunk/src
Files:
8 added
8 removed
2 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/src/colservr/Makefile.in

    r15423 r15425  
    9696 
    9797USE_CORBA = @USE_CORBA@ 
    98 USE_Z3950 = @USE_Z3950@ 
    9998 
    10099RANLIB = @RANLIB@ 
     
    140139endif 
    141140 
    142 ifeq ($(USE_Z3950), 1) 
    143 INCLUDES += -I../../packages/yaz/include -I../../packages/d2m 
    144 Z3950HEADERS =  
    145 Z3950SOURCES = z3950parser.cpp z3950explain.cpp z3950_to_gsdl.cpp z3950server.cpp 
    146 Z3950OBJECTS = z3950parser.o   z3950explain.o   z3950_to_gsdl.o   z3950server.o 
    147 else 
    148 Z3950HEADERS =  
    149 Z3950SOURCES =  
    150 Z3950OBJECTS =  
    151 endif 
    152141 
    153142# following objects need both mg and mgpp stuff - jrm21 
     
    173162 
    174163all : $(OBJECTS) 
    175     $(MAKE) USE_MGPP=1 $(MGPP_OBJECTS) $(Z3950OBJECTS) 
     164    $(MAKE) USE_MGPP=1 $(MGPP_OBJECTS) 
    176165 
    177166distclean: 
  • gsdl/trunk/src/recpt/Makefile.in

    r15424 r15425  
    278278# if they don't need to include all the yaz headers 
    279279z3950%.o: z3950%.cpp 
    280     $(COMPILE) -I$(YAZDIR)/include $< 
     280    $(COMPILE) -I$(YAZDIR)/include -I../../packages/d2m $< 
    281281 
    282282zparse.tab.c: zparse.y 
     
    394394test: 
    395395 
    396 Z3950_OBJS = recptproto.o recptprototools.o \ 
    397      $(COLSERVROBJECTS) \ 
    398     ../colservr/z3950parser.o ../colservr/z3950explain.o \ 
    399     ../colservr/z3950_to_gsdl.o \ 
    400     ../colservr/z3950server.o nullproto.o \ 
     396Z3950_OBJECTS = z3950explain.o z3950parser.o z3950server.o z3950_to_gsdl.o 
     397 
     398Z3950_OBJS = $(Z3950_OBJECTS) recptproto.o recptprototools.o nullproto.o $(COLSERVROBJECTS) \ 
    401399    ../../lib/gsdllib.a  \ 
    402400    $(INDEXERS_DIR)/mg/src/text/libmgtext.a \ 
     
    404402    $(FASTCGI_OBJS) \ 
    405403    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 
    406     $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a 
    407  
     404    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \ 
     405    ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a 
    408406 
    409407z3950server: $(Z3950_OBJS)