Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv25266
Modified Files:
NAMESPACE.make
Log Message:
use must now explicitely set the list of files to filter. The wildcard approach causes havok when NAMESPACE_PREFIX is a subdir
Index: NAMESPACE.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/NAMESPACE.make,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NAMESPACE.make 17 Nov 2003 21:05:03 -0000 1.4
+++ NAMESPACE.make 28 Nov 2003 00:48:25 -0000 1.5
@@ -6,7 +6,8 @@
# NAMESPACE = mynamespace
# NAMESPACE_TOKEN = token to replace when filtering. e.g. MY_NAMESPACE
# NAMESPACE_PREFIX = filename prefix for pre-filtered files. Defaults to "ns.".
-# All files named $(NAMESPACE_PREFIX).XXX are filtered to XXX.
+# NAMESPACE_FILES = list of files matching $(NAMESPACE_PREFIX)xxxx, which will
+# be filtered out to xxxx.
#
# Then include this file.
@@ -19,14 +20,16 @@
NAMESPACE_MAKE = $(toc_makesdir)/NAMESPACE.make
NAMESPACE_TMPFILE = .toc.NAMESPACE.tmp
-NAMESPACE_FILTERED_FILES = $(patsubst $(NAMESPACE_PREFIX)%,%,$(wildcard $(NAMESPACE_PREFIX)*))
+NAMESPACE_FILTERED_FILES += $(patsubst $(NAMESPACE_PREFIX)%,%,$(NAMESPACE_FILES))
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 --> $@ ... "; \
+ echo -e "namespace $(NAMESPACE): $$nsf\t-->\t$@"; \
sed -e 's,$(NAMESPACE_TOKEN),$(NAMESPACE),g' < $$nsf > $(NAMESPACE_TMPFILE); \
cmp -s $(NAMESPACE_TMPFILE) $@ && rm $(NAMESPACE_TMPFILE); \
- test -f $(NAMESPACE_TMPFILE) && { mv $(NAMESPACE_TMPFILE) $@; echo " updated"; } || echo " up to date";
+ test -f $(NAMESPACE_TMPFILE) \
+ && { mv $(NAMESPACE_TMPFILE) $@; echo -e "\tupdated"; } \
+ || echo -e "\tup to date";
NAMESPACE: $(NAMESPACE_FILTERED_FILES)
#NAMESPACE:
|
