Changeset 15450

Timestamp:

2008-05-14T16:19:54+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Untangling colservr/recpt) Created a new src/protocol directory, and moved the recptproto and nullproto classes into it.

Location:

gsdl/trunk/src

Files:

• protocol (added)
• protocol/Makefile.in (added)
• protocol/nullproto.cpp (added)
• protocol/nullproto.h (added)
• protocol/recptproto.cpp (added)
• protocol/recptproto.h (added)
• recpt/Makefile.in (modified) (4 diffs)
• recpt/nullproto.cpp (deleted)
• recpt/nullproto.h (deleted)
• recpt/recptproto.cpp (deleted)
• recpt/recptproto.h (deleted)

gsdl/trunk/src/recpt/Makefile.in

@@ -63 +63 @@
 ifneq ($(USE_FASTCGI), 1)
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM @DEFS@
-INCLUDES = -I../../lib -I. -I../colservr -I$(INDEXERS_DIR)/mg \
+INCLUDES = -I../../lib -I. -I../colservr -I../protocol -I$(INDEXERS_DIR)/mg \
        -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
            -I../../packages/expat/include \
@@ -69 +69 @@
 else 
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@
-INCLUDES = -I../../lib -I. -I../colservr -I$(INDEXERS_DIR)/mg \
+INCLUDES = -I../../lib -I. -I../colservr -I../protocol -I$(INDEXERS_DIR)/mg \
        -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
            -I../../packages/expat/include \
@@ -263 +263 @@
           $(LC_OBJECTS)
 
+PROTOCOLOBJECTS = ../protocol/recptproto.o \
+                  ../protocol/nullproto.o
 
 
@@ -336 +338 @@
 
 
-LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) $(Z_CLIENTOBJS) \
+LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) $(PROTOCOLOBJECTS) $(Z_CLIENTOBJS) \
     ../../lib/gsdllib.a  \
     $(INDEXERS_DIR)/mg/src/text/libmgtext.a \