[fU-cvs] libfunutil/lib/s11n/parsers Makefile,1.6,1.7

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

Update of /cvsroot/libfunutil/libfunutil/lib/s11n/parsers
In directory sc8-pr-cvs1:/tmp/cvs-serv13925/lib/s11n/parsers

Modified Files:
	Makefile 
Log Message:
mass commit: mainly build-related fixes, plus some code stuff from the cl/s11n trees.

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/s11n/parsers/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	28 Nov 2003 01:35:49 -0000	1.6
+++ Makefile	10 Dec 2003 19:42:24 -0000	1.7
@@ -33,10 +33,11 @@
 SOURCES_FLEX = $(addsuffix .flex.cpp,$(FLEXES))
 
 NAMESPACE = $(S11N_NAMESPACE)
-NAMESPACE_TOKEN = S11N_NAMESPACE
-NAMESPACE_FILTERED_FILES = $(SOURCES) $(HEADERS) $(addsuffix .flex.at,$(FLEXES))
-namespace: $(NAMESPACE_FILTERED_FILES)
-include $(toc_makesdir)/NAMESPACE.make
+FILE_FILTERS = namespace
+namespace_FILTER_RULES = -e 's|S11N_NAMESPACE|$(S11N_NAMESPACE)|g'
+namespace_FILTER_NAMESED = s,$(NAMESPACE_PREFIX),,
+namespace_FILTER_SOURCES = $(NS_SOURCES) $(NS_HEADERS) $(wildcard $(NAMESPACE_PREFIX)*.at)
+include $(TOC_MAKESDIR)/FILE_FILTERS.make
 
 
 FLEXES_ARGS = -p -+
@@ -49,7 +50,7 @@
 ifeq (0,$(enable_hexed))
 hex_FLEXES_ARGS = -i -B -Phex
 endif
-include $(toc_makesdir)/flex.make
+include $(TOC_MAKESDIR)/flex.make
 
 
 COMMON_FLEX_DEFS = common_flex_definitions.at
@@ -104,14 +105,14 @@
 INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/$(S11N_NAMESPACE)
 INSTALL_PACKAGE_HEADERS = $(HEADERS)
 
-DIST_FILES += $(NS_SOURCES) $(NS_HEADERS) $(COMMON_FLEX_DEFS)
+DIST_FILES += $(wildcard $(NAMESPACE_PREFIX)/*.* $(COMMON_FLEX_DEFS))
 
 
 SYMLINK_HEADERS = $(INSTALL_PACKAGE_HEADERS)
 SYMLINK_HEADERS_DEST = $(top_srcdir)/include/$(S11N_NAMESPACE)
-include $(toc_makesdir)/symlink_headers.make
+include $(TOC_MAKESDIR)/symlink_headers.make
 
-all: NAMESPACE flexes symlink-headers $(OBJECTS)
+all: FILE_FILTERS flexes symlink-headers $(OBJECTS)
 
 
 COMMONS_DIR = $(ELIB_LIBDIR)/common