Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv4354a
Modified Files:
NAMESPACE.make
Log Message:
removed the need for the client to set NAMESPACE_FILTERED_FILES
Index: NAMESPACE.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/NAMESPACE.make,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NAMESPACE.make 17 Nov 2003 19:08:11 -0000 1.2
+++ NAMESPACE.make 17 Nov 2003 21:00:14 -0000 1.3
@@ -5,19 +5,22 @@
# define:
# NAMESPACE = mynamespace
# NAMESPACE_TOKEN = token to replace when filtering. e.g. MY_NAMESPACE
-# NAMESPACE_PREFIX = filename prefix for pre-filtered files. Defaults to ns.
-# NAMESPACE_FILTERED_FILES = list containing XXX which should be filtered from
-# $(NAMESPACE_PREFIX)XXX.
-# then include this file.
+# NAMESPACE_PREFIX = filename prefix for pre-filtered files. Defaults to "ns.".
+# All files named $(NAMESPACE_PREFIX).XXX are filtered to XXX.
+#
+# Then include this file.
NAMESPACE_PREFIX ?= ns.
NAMESPACE_TOKEN ?= NAMESPACE
ifeq (,$(NAMESPACE))
$(error You must set the variable NAMESPACE before including this file.)
endif
-$(top_srcdir)/toc.$(PACKAGE_NAME).make:
+
NAMESPACE_MAKE = $(toc_makesdir)/NAMESPACE.make
NAMESPACE_TMPFILE = .toc.NAMESPACE.tmp
+
+NAMESPACE_FILTERED_FILES = $(patsubst $(NAMESPACE_PREFIX)%,%,$(wildcard $(NAMESPACE_PREFIX)*))
+CLEAN_FILES += $(NAMESPACE_FILTERED_FILES)
$(NAMESPACE_FILTERED_FILES): %: $(NAMESPACE_PREFIX)% Makefile $(top_srcdir)/toc.$(PACKAGE_NAME).make $(NAMESPACE_MAKE)
@nsf=$<; \
echo -n "namespace $(NAMESPACE): $$nsf --> $@ ... "; \
@@ -25,3 +28,8 @@
cmp -s $(NAMESPACE_TMPFILE) $@ && rm $(NAMESPACE_TMPFILE); \
test -f $(NAMESPACE_TMPFILE) && { mv $(NAMESPACE_TMPFILE) $@; echo " updated"; } || echo " up to date";
+#NAMESPACE: $(NAMESPACE_FILTERED_FILES)
+NAMESPACE:
+ @echo NAMESPACE_PREFIX=$(NAMESPACE_PREFIX)
+ @echo NAMESPACE_FILTERED_FILES=$(NAMESPACE_FILTERED_FILES)
+ @echo $(NAMESPACE_PREFIX)*
|
