Changeset 15425

Timestamp:

2008-05-13T17:06:17+12:00 (16 years ago)

Author:

mdewsnip

Message:

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

Location:

gsdl/trunk/src

Files:

• colservr/Makefile.in (modified) (3 diffs)
• colservr/z3950_to_gsdl.cpp (deleted)
• colservr/z3950_to_gsdl.h (deleted)
• colservr/z3950explain.cpp (deleted)
• colservr/z3950explain.h (deleted)
• colservr/z3950parser.cpp (deleted)
• colservr/z3950parser.h (deleted)
• colservr/z3950server.cpp (deleted)
• colservr/z3950server.h (deleted)
• recpt/Makefile.in (modified) (3 diffs)
• recpt/z3950_to_gsdl.cpp (added)
• recpt/z3950_to_gsdl.h (added)
• recpt/z3950explain.cpp (added)
• recpt/z3950explain.h (added)
• recpt/z3950parser.cpp (added)
• recpt/z3950parser.h (added)
• recpt/z3950server.cpp (added)
• recpt/z3950server.h (added)

gsdl/trunk/src/colservr/Makefile.in

@@ -96 +96 @@
 
 USE_CORBA = @USE_CORBA@
-USE_Z3950 = @USE_Z3950@
 
 RANLIB = @RANLIB@
@@ -140 +139 @@
 endif
 
-ifeq ($(USE_Z3950), 1)
-INCLUDES += -I../../packages/yaz/include -I../../packages/d2m
-Z3950HEADERS = 
-Z3950SOURCES = z3950parser.cpp z3950explain.cpp z3950_to_gsdl.cpp z3950server.cpp
-Z3950OBJECTS = z3950parser.o   z3950explain.o   z3950_to_gsdl.o   z3950server.o
-else
-Z3950HEADERS = 
-Z3950SOURCES = 
-Z3950OBJECTS = 
-endif
 
 # following objects need both mg and mgpp stuff - jrm21
@@ -173 +162 @@
 
 all : $(OBJECTS)
-    $(MAKE) USE_MGPP=1 $(MGPP_OBJECTS) $(Z3950OBJECTS)
+    $(MAKE) USE_MGPP=1 $(MGPP_OBJECTS)
 
 distclean:

gsdl/trunk/src/recpt/Makefile.in

@@ -278 +278 @@
 # if they don't need to include all the yaz headers
 z3950%.o: z3950%.cpp
-    $(COMPILE) -I$(YAZDIR)/include $<
+    $(COMPILE) -I$(YAZDIR)/include -I../../packages/d2m $<
 
 zparse.tab.c: zparse.y
@@ -394 +394 @@
 test:
 
-Z3950_OBJS = recptproto.o recptprototools.o \
-     $(COLSERVROBJECTS) \
-    ../colservr/z3950parser.o ../colservr/z3950explain.o \
-    ../colservr/z3950_to_gsdl.o \
-    ../colservr/z3950server.o nullproto.o \
+Z3950_OBJECTS = z3950explain.o z3950parser.o z3950server.o z3950_to_gsdl.o
+
+Z3950_OBJS = $(Z3950_OBJECTS) recptproto.o recptprototools.o nullproto.o $(COLSERVROBJECTS) \
     ../../lib/gsdllib.a  \
     $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
@@ -404 +402 @@
     $(FASTCGI_OBJS) \
     $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
-    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
-
+    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
+    ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a
 
 z3950server: $(Z3950_OBJS)