[fU-cvs] libfunutil toc.s11n.make.at,1.2,1.3

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

Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv18024

Modified Files:
	toc.s11n.make.at 
Log Message:
s11n finally integrated into fun namespace. Still a few filename stepping-on-toes problems to solve.

Index: toc.s11n.make.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc.s11n.make.at,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- toc.s11n.make.at	17 Nov 2003 20:27:18 -0000	1.2
+++ toc.s11n.make.at	17 Nov 2003 22:00:44 -0000	1.3
@@ -17,13 +17,19 @@
 S11N_NAMESPACE = @S11N_NAMESPACE@
 TOOLBOX_NAMESPACE = @TOOLBOX_NAMESPACE@
 S11N_LIBDIR = $(top_srcdir)/lib
-S11N_LIB_A = $(S11N_LIBDIR)/libs11n.a
+ifeq (s11n,$(S11N_NAMESPACE))
+S11N_LIBNAME = s11n
+else
+S11N_LIBNAME = $(S11N_NAMESPACE)_s11n
+endif
+
+S11N_LIB_A = $(S11N_LIBDIR)/lib$(S11N_LIBNAME).a
 $(S11N_LIB_A):
 	${MAKE} -C $(S11N_LIBDIR)
-S11N_LIB_SO = $(S11N_LIBDIR)/libs11n.so
+S11N_LIB_SO = $(S11N_LIBDIR)/lib$(S11N_LIBNAME).so
 $(S11N_LIB_SO):
 	${MAKE} -C $(S11N_LIBDIR)
-L_S11N =  -L$(S11N_LIBDIR) -ls11n
+L_S11N =  -L$(S11N_LIBDIR) -l$(S11N_LIBNAME)
 S11N_CLIENT_LDADD = $(L_S11N) $(LIBCL_CLIENT_LDADD)
 ifeq (1,$(configure_enable_zlib))
     S11N_CLIENT_LDADD += -lz