[fU-cvs] libfunutil/lib Makefile,1.8,1.9

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

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

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

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	17 Nov 2003 20:26:12 -0000	1.8
+++ Makefile	17 Nov 2003 22:00:48 -0000	1.9
@@ -1,4 +1,6 @@
 include toc.make
+# expected via toc:
+# LIBS11N_LIBNAME
 
 
 ifeq (1,$(configure_enable_s11n))
@@ -7,6 +9,34 @@
 
 SUBDIRS += funUtil
 
+
+
+############################## OBJECTS
+# Note that these OBJECTS vars will resolve to empty on an initial
+# build, requiring a sub-make (after building SUBDIRS) to get the
+# proper values here:
+OBJECTS_CL = $(patsubst %,cl/%.o,class_loader path_finder)
+OBJECTS_TOOLBOX = $(wildcard toolbox/*.o)
+OBJECTS_S11N = $(wildcard s11n/*.o s11n/parsers/*.o)
+
+
+S11N_LIBNAME ?= s11n
+############################## static libs
+STATIC_LIBS =  lib$(S11N_LIBNAME)
+lib$(S11N_LIBNAME)_a_OBJECTS = $(OBJECTS_TOOLBOX) $(OBJECTS_S11N) $(OBJECTS_CL)
+include $(toc_makesdir)/STATIC_LIBS.make
+
+############################## enable/disable shared libs:
+build_so = 1
+ifeq (1,$(build_so))
+    SHARED_LIBS = $(STATIC_LIBS)
+    lib$(S11N_LIBNAME)_so_OBJECTS = $(OBJECTS_TOOLBOX) $(OBJECTS_S11N) ${PWD}/cl/lib$(LIBCL_LIBNAME).so
+    lib$(S11N_LIBNAME)_so_VERSION = $(PACKAGE_VERSION)
+    include $(toc_makesdir)/SHARED_LIBS.make
+endif
+# ^^^^ build shared libs?
+
 all: subdirs
+	@${MAKE} --no-print-directory STATIC_LIBS SHARED_LIBS
 
 DIST_FILES += Makefile.bt