[fU-cvs] libfunutil/lib/s11n/parsers Makefile,1.3,1.4

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

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

Modified Files:
	Makefile 
Log Message:
namespace-related refactoring

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/s11n/parsers/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	14 Oct 2003 03:38:14 -0000	1.3
+++ Makefile	17 Nov 2003 20:30:37 -0000	1.4
@@ -1,16 +1,37 @@
 include toc.make
-SOURCES = \
-	flex_lexers.cpp
 
+S11N_NAMESPACE ?= s11n
+
+NS_SOURCES = \
+	ns.flex_lexers.cpp
+NS_HEADERS = \
+	ns.flex_lexers.h
+# Be careful with SOURCES/HEADERS, lest they be cleaned up when you don't
+# want them to be. Simplest is to put everything into NS_{HEADERS/SOURCES} and expect
+# them to be filtered by sed.
+SOURCES = \
+	$(patsubst ns.%,%,$(NS_SOURCES)) 
 HEADERS = \
-	flex_lexers.h
+	$(patsubst ns.%,%,$(NS_HEADERS)) 
+CLEAN_FILES += $(SOURCES) $(HEADERS)
 
-INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/s11n
+
+INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/$(S11N_NAMESPACE)
 INSTALL_PACKAGE_HEADERS = $(HEADERS)
 
-FLEXES = compact hex paren funtxt funxml select_lexer simplexml
+FLEXES = compact paren funtxt funxml select_lexer simplexml
+CLEAN_FILES += $(addsuffix .flex.at,$(FLEXES))
+# hex
 SOURCES_FLEX = $(addsuffix .flex.cpp,$(FLEXES))
 
+NAMESPACE = $(S11N_NAMESPACE)
+NAMESPACE_TOKEN = S11N_NAMESPACE
+NAMESPACE_PREFIX = ns.
+NAMESPACE_FILTERED_FILES = $(SOURCES) $(HEADERS) $(addsuffix .flex.at,$(FLEXES))
+namespace: $(NAMESPACE_FILTERED_FILES)
+include $(toc_makesdir)/NAMESPACE.make
+
+
 FLEXES_ARGS = -p -+
 funtxt_FLEXES_ARGS = -B -Psertxt
 funxml_FLEXES_ARGS = -B -Pserxml
@@ -68,17 +89,18 @@
 
 OBJECTS = $(patsubst %.cpp,%.o,$(SOURCES) $(SOURCES_FLEX))
 
+INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/$(S11N_NAMESPACE)
 INSTALL_PACKAGE_HEADERS = $(HEADERS)
 
-DIST_FILES += $(SOURCES) $(HEADERS) $(COMMON_FLEX_DEFS) \
-	$(addsuffix .flex.at,$(FLEXES))
+DIST_FILES += $(wildcard ns.*) \
+	$(COMMON_FLEX_DEFS)
 
 
 SYMLINK_HEADERS = $(INSTALL_PACKAGE_HEADERS)
-SYMLINK_HEADERS_DEST = $(top_srcdir)/include/s11n
+SYMLINK_HEADERS_DEST = $(top_srcdir)/include/$(S11N_NAMESPACE)
 include $(toc_makesdir)/symlink_headers.make
 
-all: flexes symlink-headers $(OBJECTS)
+all: namespace flexes symlink-headers $(OBJECTS)
 
 
 COMMONS_DIR = $(ELIB_LIBDIR)/common
@@ -117,5 +139,3 @@
 CLEAN_FILES += $(bins)
 bins: $(bins)
 CLEAN_FILES += *.o
-
-