[fU-cvs] libfunutil/client/s11nconvert Makefile,1.7,1.8

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

Update of /cvsroot/libfunutil/libfunutil/client/s11nconvert
In directory sc8-pr-cvs1:/tmp/cvs-serv13367/client/s11nconvert

Modified Files:
	Makefile 
Log Message:
moved sources to src/

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	28 Nov 2003 01:35:48 -0000	1.7
+++ Makefile	10 Dec 2003 19:39:54 -0000	1.8
@@ -1,4 +1,5 @@
 
+default: all
 include toc.make
 ############################## expected from toc.make:
 S11N_NAMESPACE ?= s11n
@@ -7,8 +8,8 @@
 # CPPFLAGS += -DCLASSLOADER_DEBUG=1
 
 
-DIST_FILES += $(wildcard in.* *.cpp *.h)
-
+DIST_FILES += $(wildcard in.* src/*.cpp src/*.h)
+CLEAN_FILES += src/*~
 
 
 
@@ -41,7 +42,7 @@
 maser_cpp_CPPFLAGS = $(main_cpp_CPPFLAGS)
 BIN_PROGRAMS_LDADD += $(S11N_CLIENT_LDADD)
 
-include $(toc_makesdir)/BIN_PROGRAMS.make
+include $(TOC_MAKESDIR)/BIN_PROGRAMS.make
 
 INSTALL_BINS = s11nconvert
 
@@ -55,7 +56,7 @@
 # LoadableSubclass_so_OBJECTS = LoadableSubclass.o
 BigSO_so_OBJECTS = BarClass.o FooClass.o
 CLEAN_FILES += FooClass.so BarClass.so
-include $(toc_makesdir)/SHARED_LIBS.make
+include $(TOC_MAKESDIR)/SHARED_LIBS.make
 link-bigso: BigSO.so
 	for i in FooClass BarClass; do ln -fs $< $$i.so; done
 
@@ -71,15 +72,18 @@
 
 install-BINS: strip-bins
 
-NAMESPACE = $(S11N_NAMESPACE)
-NAMESPACE_TOKEN = S11N_NAMESPACE
-NAMESPACE_PREFIX = ns.
-NAMESPACE_FILES = $(wildcard $(NAMESPACE_PREFIX)*)
-include $(toc_makesdir)/NAMESPACE.make
+FILE_FILTERS = namespace
+namespace_FILTER_RULES = -e 's|S11N_NAMESPACE|$(S11N_NAMESPACE)|g'
+NAMESPACE_PREFIX = src/
+namespace_FILTER_SOURCES = $(wildcard $(NAMESPACE_PREFIX)*.cpp $(NAMESPACE_PREFIX)*.h)
 
+namespace_FILTER_NAMESED = s,$(NAMESPACE_PREFIX),,
+include $(TOC_MAKESDIR)/FILE_FILTERS.make
 
-all: NAMESPACE BIN_PROGRAMS SHARED_LIBS tip link-bigso
+all: FILE_FILTERS BIN_PROGRAMS SHARED_LIBS tip link-bigso
 
 alt: clean
 	ALTS11N=1 ${MAKE}
 
+
+foo: FILE_FILTERS