[pclasses-cvs] pclasses2/src/s11n Makefile.toc,1.12,1.13 S11nNode.cpp,1.1,NONE S11nNode.h,1.3,NONE SIO.cpp,1.5,NONE SIO.h,1.9,NONE

[stephan b. <sg...@us...>]

Update of /cvsroot/pclasses/pclasses2/src/s11n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13760/src/s11n

Modified Files:
	Makefile.toc 
Removed Files:
	S11nNode.cpp S11nNode.h SIO.cpp SIO.h 
Log Message:
Moved SIO & S11nNode to SIO module, to a) keep deps correct, b) make the intended client-side interface clearer (hide more of s11n from it), c) ease porting of code between s11n.net and pclasses.com.

--- S11nNode.h DELETED ---

--- S11nNode.cpp DELETED ---

--- SIO.h DELETED ---

--- SIO.cpp DELETED ---

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/s11n/Makefile.toc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.toc	28 Dec 2004 16:11:07 -0000	1.12
+++ Makefile.toc	29 Dec 2004 19:54:43 -0000	1.13
@@ -8,12 +8,7 @@
 SOURCES = \
 	data_node.cpp \
 	s11n.cpp \
-	s11n_node.cpp \
-	S11nNode.cpp \
-	SIO.cpp
-
-
-#	string_util.cpp
+	s11n_node.cpp
 
 HEADERS = $(wildcard *.h)
 
@@ -22,14 +17,12 @@
 	data_node \
 	s11n \
 	s11n_node \
-	S11nNode \
-	SIO \
 	)
 
 objects: $(OBJECTS)
 
 INSTALL_PACKAGE_HEADERS = $(HEADERS)
-INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/s11n.net/s11n
+INSTALL_PACKAGE_HEADERS_DEST = $(INSTALL_PACKAGE_HEADERS_BASE)/s11n
 
 DIST_FILES += $(wildcard *.at) $(SOURCES) $(HEADERS) 
 
@@ -37,11 +30,11 @@
 SYMLINK_HEADERS_DEST = $(top_srcdir)/include/pclasses/s11n
 include $(TOC_MAKESDIR)/SYMLINK_HEADERS.make
 
-SUBDIR_OBJECTS = io/data_node_io.o
-ifeq (1,$(PCLASSES_HAVE_LIBEXPAT))
-  SUBDIR_OBJECTS += io/expat/expat_serializer.o
-endif
-  SUBDIR_OBJECTS += io/parens/parens_serializer.o
+#SUBDIR_OBJECTS = io/data_node_io.o
+#ifeq (1,$(PCLASSES_HAVE_LIBEXPAT))
+#  SUBDIR_OBJECTS += io/expat/expat_serializer.o
+#endif
+#SUBDIR_OBJECTS += io/parens/parens_serializer.o
 
 
 # odd: always causes the .o to be rebuilt:
@@ -50,7 +43,7 @@
 
 
 SHARED_LIBS = libpclasses_s11n
-libpclasses_s11n_so_LDADD = $(LIBEXPAT_CLIENT_LDADD)
+libpclasses_s11n_so_LDADD = $(LIBPS11N_LDADD)
 libpclasses_s11n_so_OBJECTS = $(OBJECTS) $(SUBDIR_OBJECTS)
 libpclasses_s11n_so_VERSION = $(PACKAGE_VERSION)
 include $(TOC_MAKESDIR)/SHARED_LIBS.make