Update of /cvsroot/libfunutil/libfunutil/lib/toolbox
In directory sc8-pr-cvs1:/tmp/cvs-serv12365/lib/toolbox
Modified Files:
Makefile
Log Message:
major refactoring to support a mutable namespace.
Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 14 Oct 2003 03:10:24 -0000 1.1
+++ Makefile 17 Nov 2003 19:22:36 -0000 1.2
@@ -1,52 +1,64 @@
include toc.make
-SOURCES = \
- ClassLoader.cpp \
- DLLLoader.cpp \
- KeyValueParser.cpp \
- PathFinder.cpp \
- PropertyStore.cpp \
- SimpleCLParser.cpp \
- StdStringTokenizer.cpp \
- StringTokenizer.cpp \
- file_util.cpp \
- string_util.cpp \
- to_string.cpp
+# maintenance notes:
+# imported via toc:
+# $(TOOLBOX_NAMESPACE)
-HEADERS = ChildrenHolder.h \
- ClassLoader.h \
- DLLLoader.h \
- Instantiator.h \
- KeyValueParser.h \
- PathFinder.h \
- PointerList.h \
- PropertyStore.h \
- SimpleCLParser.h \
- StdStringTokenizer.h \
- StringTokenizer.h \
- class_name.h \
- debuggering_macros.h \
- eprintf.h \
- file_util.h \
- string_util.h \
- to_string.h \
- toolbox.h
+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
+
+
+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
-NAMESPACE = toolbox
ifeq (1,$(configure_enable_zlib))
-SOURCES += gzstream.cpp
-HEADERS += gzstream.h
+NS_SOURCES += ns.gzstream.cpp
+NS_HEADERS += ns.gzstream.h
endif
ifeq (1,$(configure_enable_bzlib))
-SOURCES += bzstream.cpp
-HEADERS += bzstream.h
+NS_SOURCES += ns.bzstream.cpp
+NS_HEADERS += ns.bzstream.h
endif
+SOURCES = $(patsubst ns.%,%,$(NS_SOURCES))
+HEADERS = $(patsubst ns.%,%,$(NS_HEADERS))
+CLEAN_FILES += $(SOURCES) $(HEADERS)
+
+
+NAMESPACE = $(TOOLBOX_NAMESPACE)
+NAMESPACE_TOKEN = TOOLBOX_NAMESPACE
+NAMESPACE_PREFIX = ns.
+NAMESPACE_FILTERED_FILES = $(SOURCES) $(HEADERS)
+include $(toc_makesdir)/NAMESPACE.make
+
top_srcdir_absolute = $(shell cd $(top_srcdir) && pwd)
-# DLLLoader_cpp_CPPFLAGS = -DDLLLOADER_DEFAULT_PATH=\".:$(top_srcdir_absolute)/lib/s11n:$(prefix)/lib\"
+# dll_loader_cpp_CPPFLAGS = -DCLASS_LOADER_DEFAULT_PATH=\".:$(top_srcdir_absolute)/lib/s11n:$(prefix)/lib\"
EPRINTF = eprintf_impl.h
@@ -61,28 +73,25 @@
@echo "Creating printf implementations..."
$(PERL_BIN) ./makePrintf $(EPRINTF_COUNT) >> $@
-#PACKAGE_NS_H = package_namespace.h
-#$(PACKAGE_NS_H): $(PACKAGE_NS_H).at Makefile
-# @$(call toc_atparse_file,$<,$@,PACKAGE_NAMESPACE="$(NAMESPACE)") \
-# || exit; touch $@
-
-INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/$(NAMESPACE)
+INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/$(TOOLBOX_NAMESPACE)
INSTALL_PACKAGE_HEADERS = $(HEADERS) $(EPRINTF)
-SYMLINK_HEADERS = $(INSTALL_PACKAGE_HEADERS)
-SYMLINK_HEADERS_DEST = $(top_srcdir)/include/$(NAMESPACE)
+SYMLINK_HEADERS = $(INSTALL_PACKAGE_HEADERS)
+SYMLINK_HEADERS_DEST = $(top_srcdir)/include/$(TOOLBOX_NAMESPACE)
include $(toc_makesdir)/symlink_headers.make
OBJECTS = $(patsubst %.cpp,%.o,$(SOURCES))
-DIST_FILES += $(SOURCES) $(HEADERS) makePrintf
+DIST_FILES += $(NS_SOURCES) $(NS_HEADERS) makePrintf class_names
+# DIST_FILES += LoadableClass.cpp LoadableClass.h LoadableSubClass.cpp
-all: $(EPRINTF) symlink-headers $(OBJECTS)
+all: $(SOURCES) $(HEADERS) $(EPRINTF) symlink-headers $(OBJECTS)
+# SHARED_LIBS
# $(ENM_NAMESFILE)
|
