[pclasses-cvs] pclasses2 configure.pclasses2,1.17,1.18 toc.pclasses2.make.at,1.7,1.8

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

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

Modified Files:
	configure.pclasses2 toc.pclasses2.make.at 
Log Message:
Added SIO module.

Index: toc.pclasses2.make.at
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/toc.pclasses2.make.at,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- toc.pclasses2.make.at	26 Dec 2004 14:54:30 -0000	1.7
+++ toc.pclasses2.make.at	29 Dec 2004 19:56:14 -0000	1.8
@@ -1,10 +1,11 @@
+
 #!/do/not/make
 #^^^ only to help emacs out.
 
 CLEAN_FILES += $(wildcard *.o *~)
 
 
-INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/include/pclasses $(PACKAGE_INCLUDES)
+INCLUDES += -I$(top_srcdir)/include $(PACKAGE_INCLUDES)
 
 # CXXFLAGS += -fPIC
 
@@ -23,8 +24,10 @@
 ########################################################################
 # P_BACKLINK_LDADD is for use by in-tree libs which need a -L arg
 # to link back to other in-tree libs.
-P_BACKLINK_LDADD = -L$(top_srcdir)/lib
-#	-L$(top_srcdir)/src $(addprefix -L$(top_srcdir)/src/,System Util Unicode IO Net)
+P_BACKLINK_LDADD = -L$(top_srcdir)/lib \
+	-L$(top_srcdir)/src $(addprefix -L$(top_srcdir)/src/,System Util Unicode IO Net SIO s11n)
+### ^^^^ These -L's for each module really sucks, but is unfortunately necessary
+### for the time being.
 
 ####################################################################################
 # Linker args for in-build-tree tests, so they can link back to the in-tree
@@ -47,3 +50,5 @@
 	@true
 -l$(LIBPS11N_BASENAME):
 	@true
+-l$(LIBPSIO_BASENAME):
+	@true

Index: configure.pclasses2
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/configure.pclasses2,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- configure.pclasses2	28 Dec 2004 22:11:24 -0000	1.17
+++ configure.pclasses2	29 Dec 2004 19:56:14 -0000	1.18
@@ -194,7 +194,7 @@
 
 toc_export LIBPSYSTEM_BASENAME=pclasses_system
 toc_export LIBPSYSTEM_LDADD="${THREADS_LDADD} ${LDADD_DL} ${LDADD_SHM}"
-toc_export LIBPSYSTEM_CLIENT_LDADD="-l${LIBPSYSTEM_BASENAME}  ${LIBPIO_CLIENT_LDADD} ${LIBPUNICODE_CLIENT_LDADD}"
+toc_export LIBPSYSTEM_CLIENT_LDADD="-l${LIBPSYSTEM_BASENAME} ${LIBPIO_CLIENT_LDADD} ${LIBPUNICODE_CLIENT_LDADD}"
 toc_export LIBPSYSTEM_CFLAGS="${THREADS_CFLAGS}"
 
 toc_export LIBPUTIL_BASENAME=pclasses_util
@@ -203,10 +203,15 @@
 toc_export LIBPUTIL_CFLAGS="${THREADS_CFLAGS}"
 
 toc_export LIBPS11N_BASENAME=pclasses_s11n
-toc_export LIBPS11N_LDADD="${LIBEXPAT_CLIENT_LDADD}"
+toc_export LIBPS11N_LDADD=""
 toc_export LIBPS11N_CLIENT_LDADD="-l${LIBPS11N_BASENAME}"
 toc_export LIBPS11N_CFLAGS=""
 
+toc_export LIBPSIO_BASENAME=pclasses_sio
+toc_export LIBPSIO_LDADD="${LIBEXPAT_CLIENT_LDADD} ${LIBPS11N_CLIENT_LDADD} ${LIBPSYSTEM_CLIENT_LDADD} ${LIBPUTIL_CLIENT_LDADD}"
+toc_export LIBPSIO_CLIENT_LDADD="-l${LIBPSIO_BASENAME}"
+toc_export LIBPSIO_CFLAGS=""
+
 ########################################################################
 # Enable mysql driver...
 if test -x "${MYSQL_CONFIG_BIN}"; then