Update of /cvsroot/libfunutil/libfunutil/lib/s11n
In directory sc8-pr-cvs1:/tmp/cvs-serv32411/lib/s11n
Modified Files:
Makefile
Log Message:
fixed a class-renaming snaffu caused by a cross-tree blunder
Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/s11n/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 19 Nov 2003 22:11:54 -0000 1.6
+++ Makefile 28 Nov 2003 01:35:49 -0000 1.7
@@ -3,50 +3,52 @@
S11N_NAMESPACE ?= s11n
-NS_SOURCES = \
- ns.compact_serializer.cpp \
- ns.paren_serializer.cpp \
- ns.s11n_io.cpp \
- ns.s11n_node.cpp \
- ns.node_builder.cpp \
- ns.node_loader.cpp \
- ns.serializable.cpp \
- ns.serializer.cpp \
- ns.serializer_loader.cpp \
- ns.s11n_globals.cpp
+NAMESPACE_PREFIX = src/
+
+NS_SOURCES = $(addprefix $(NAMESPACE_PREFIX),\
+ compact_serializer.cpp \
+ paren_serializer.cpp \
+ s11n_io.cpp \
+ s11n_node.cpp \
+ node_builder.cpp \
+ node_loader.cpp \
+ serializable.cpp \
+ serializer.cpp \
+ serializer_loader.cpp \
+ s11n_globals.cpp \
+ )
# buggy:
# hex_serializer.cpp
-NS_HEADERS = \
- ns.s11n.h \
- ns.s11n_io.h \
- ns.s11n_node.h \
- ns.node_builder.h \
- ns.node_loader.h \
- ns.serializable.h \
- ns.serializable_adapter.h \
- ns.serializer.h \
- ns.serializer_loader.h \
- ns.s11n-macros.h \
- ns.s11n_globals.h
+NS_HEADERS = $(addprefix $(NAMESPACE_PREFIX),\
+ s11n.h \
+ s11n_io.h \
+ s11n_node.h \
+ node_builder.h \
+ node_loader.h \
+ serializable.h \
+ serializable_adapter.h \
+ serializer.h \
+ serializer_loader.h \
+ s11n-macros.h \
+ s11n_globals.h \
+ )
# Be careful with SOURCES/HEADERS, lest they be cleaned up when you don't
# want them to be. Simplest is to put everything into NS_{HEADERS/SOURCES} and expect
# them to be filtered by sed.
SOURCES = \
- $(patsubst ns.%,%,$(NS_SOURCES))
+ $(patsubst $(NAMESPACE_PREFIX)%,%,$(NS_SOURCES))
HEADERS = \
- $(patsubst ns.%,%,$(NS_HEADERS))
+ $(patsubst $(NAMESPACE_PREFIX)%,%,$(NS_HEADERS))
CLEAN_FILES += $(SOURCES) $(HEADERS)
NAMESPACE = $(S11N_NAMESPACE)
NAMESPACE_TOKEN = S11N_NAMESPACE
-NAMESPACE_PREFIkX = ns.
-NAMESPACE_FILTERED_FILES = $(SOURCES) $(HEADERS)
-namespace: $(NAMESPACE_FILTERED_FILES)
+NAMESPACE_FILES = $(NS_SOURCES) $(NS_HEADERS)
include $(toc_makesdir)/NAMESPACE.make
@@ -60,7 +62,7 @@
# DIST_FILES += $(sort $(wildcard *.cpp) $(wildcard *.h) $(wildcard *.make))
-DIST_FILES += $(wildcard ns.* *.at)
+DIST_FILES += $(wildcard *.at) $(NS_SOURCES) $(NS_HEADERS)
SYMLINK_HEADERS = $(INSTALL_PACKAGE_HEADERS)
@@ -71,7 +73,7 @@
# @$(call toc_make_uninstall,$(INSTALL_PACKAGE_HEADERS),$(INSTALL_PACKAGE_HEADERS_DEST))
-all: namespace symlink-headers subdir-parsers $(OBJECTS)
+all: NAMESPACE symlink-headers subdir-parsers $(OBJECTS)
# SHARED_LIBS STATIC_LIBS BIN_PROGRAMS
# all: symlink-headers subdir-parsers $(OBJECTS)
|
