Update of /cvsroot/libfunutil/libfunutil/lib/toolbox
In directory sc8-pr-cvs1:/tmp/cvs-serv32411/lib/toolbox
Modified Files:
Makefile
Log Message:
fixed a class-renaming snaffu caused by a cross-tree blunder
Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 19 Nov 2003 22:48:42 -0000 1.3
+++ Makefile 28 Nov 2003 01:35:49 -0000 1.4
@@ -7,53 +7,56 @@
TOOLBOX_NAMESPACE ?= toolbox
-NS_SOURCES = \
- ns.argv_parser.cpp \
- ns.file_util.cpp \
- ns.key_value_parser.cpp \
- ns.property_store.cpp \
- ns.stdstring_tokenizer.cpp \
- ns.string_tokenizer.cpp \
- ns.string_util.cpp \
- ns.to_string.cpp
+NAMESPACE_PREFIX = src/
+NS_SOURCES = $(addprefix $(NAMESPACE_PREFIX),\
+ argv_parser.cpp \
+ file_util.cpp \
+ key_value_parser.cpp \
+ property_store.cpp \
+ stdstring_tokenizer.cpp \
+ string_tokenizer.cpp \
+ string_util.cpp \
+ to_string.cpp \
+ )
-NS_HEADERS = \
- ns.any.h \
- ns.argv_parser.h \
- ns.children_holder.h \
- ns.class_name.h \
- ns.debuggering_macros.h \
- ns.eprintf.h \
- ns.file_util.h \
- ns.key_value_parser.h \
- ns.pointer_list.h \
- ns.property_store.h \
- ns.stdstring_tokenizer.h \
- ns.string_tokenizer.h \
- ns.string_util.h \
- ns.to_string.h \
- ns.type_traits.h
+
+NS_HEADERS = $(addprefix $(NAMESPACE_PREFIX),\
+ any.h \
+ argv_parser.h \
+ children_holder.h \
+ class_name.h \
+ debuggering_macros.h \
+ eprintf.h \
+ file_util.h \
+ key_value_parser.h \
+ pointer_list.h \
+ property_store.h \
+ stdstring_tokenizer.h \
+ string_tokenizer.h \
+ string_util.h \
+ to_string.h \
+ type_traits.h \
+ )
#ifeq (1,$(configure_enable_zlib))
-NS_SOURCES += ns.gzstream.cpp
-NS_HEADERS += ns.gzstream.h
+NS_SOURCES += $(NAMESPACE_PREFIX)gzstream.cpp
+NS_HEADERS += $(NAMESPACE_PREFIX)gzstream.h
#endif
#ifeq (1,$(configure_enable_bzlib))
-NS_SOURCES += ns.bzstream.cpp
-NS_HEADERS += ns.bzstream.h
+NS_SOURCES += $(NAMESPACE_PREFIX)bzstream.cpp
+NS_HEADERS += $(NAMESPACE_PREFIX)bzstream.h
#endif
-SOURCES = $(patsubst ns.%,%,$(NS_SOURCES))
-HEADERS = $(patsubst ns.%,%,$(NS_HEADERS))
+SOURCES = $(patsubst $(NAMESPACE_PREFIX)%,%,$(NS_SOURCES))
+HEADERS = $(patsubst $(NAMESPACE_PREFIX)%,%,$(NS_HEADERS))
CLEAN_FILES += $(SOURCES) $(HEADERS)
NAMESPACE = $(TOOLBOX_NAMESPACE)
NAMESPACE_TOKEN = TOOLBOX_NAMESPACE
-NAMESPACE_PREFIX = ns.
-NAMESPACE_FILTERED_FILES = $(SOURCES) $(HEADERS)
+NAMESPACE_FILES = $(NS_SOURCES) $(NS_HEADERS)
include $(toc_makesdir)/NAMESPACE.make
|
