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

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

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

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/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	28 Nov 2003 01:35:49 -0000	1.7
+++ Makefile	10 Dec 2003 19:42:24 -0000	1.8
@@ -36,6 +36,15 @@
 	s11n_globals.h \
 	)
 
+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)
+namespace-notice:
+	@echo "Package namespace is $(S11N_NAMESPACE)."
+FILE_FILTERS: namespace-notice
+include $(TOC_MAKESDIR)/FILE_FILTERS.make
+
 
 # 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
@@ -44,12 +53,6 @@
 	$(patsubst $(NAMESPACE_PREFIX)%,%,$(NS_SOURCES)) 
 HEADERS = \
 	$(patsubst $(NAMESPACE_PREFIX)%,%,$(NS_HEADERS)) 
-CLEAN_FILES += $(SOURCES) $(HEADERS)
-
-NAMESPACE = $(S11N_NAMESPACE)
-NAMESPACE_TOKEN = S11N_NAMESPACE
-NAMESPACE_FILES = $(NS_SOURCES) $(NS_HEADERS)
-include $(toc_makesdir)/NAMESPACE.make
 
 
 
@@ -67,13 +70,13 @@
 
 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
 
 #uninstall-local:
 #	@$(call toc_make_uninstall,$(INSTALL_PACKAGE_HEADERS),$(INSTALL_PACKAGE_HEADERS_DEST))
 
 
-all: NAMESPACE symlink-headers subdir-parsers $(OBJECTS)
+all: FILE_FILTERS symlink-headers subdir-parsers $(OBJECTS)
 # SHARED_LIBS STATIC_LIBS BIN_PROGRAMS
 # all: symlink-headers subdir-parsers $(OBJECTS)