Update of /cvsroot/libfunutil/libfunutil/lib/s11n/parsers
In directory sc8-pr-cvs1:/tmp/cvs-serv32411/lib/s11n/parsers
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/parsers/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 19 Nov 2003 22:11:54 -0000 1.5
+++ Makefile 28 Nov 2003 01:35:49 -0000 1.6
@@ -2,19 +2,23 @@
S11N_NAMESPACE ?= s11n
+NAMESPACE_PREFIX = src/
+
enable_hexed = 0
-NS_SOURCES = \
- ns.flex_lexers.cpp
-NS_HEADERS = \
- ns.flex_lexers.h
+NS_SOURCES = $(addprefix $(NAMESPACE_PREFIX),\
+ flex_lexers.cpp \
+ )
+NS_HEADERS = $(addprefix $(NAMESPACE_PREFIX),\
+ flex_lexers.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)
@@ -30,7 +34,6 @@
NAMESPACE = $(S11N_NAMESPACE)
NAMESPACE_TOKEN = S11N_NAMESPACE
-NAMESPACE_PREFIX = ns.
NAMESPACE_FILTERED_FILES = $(SOURCES) $(HEADERS) $(addsuffix .flex.at,$(FLEXES))
namespace: $(NAMESPACE_FILTERED_FILES)
include $(toc_makesdir)/NAMESPACE.make
@@ -101,15 +104,14 @@
INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/$(S11N_NAMESPACE)
INSTALL_PACKAGE_HEADERS = $(HEADERS)
-DIST_FILES += $(wildcard ns.*) \
- $(COMMON_FLEX_DEFS)
+DIST_FILES += $(NS_SOURCES) $(NS_HEADERS) $(COMMON_FLEX_DEFS)
SYMLINK_HEADERS = $(INSTALL_PACKAGE_HEADERS)
SYMLINK_HEADERS_DEST = $(top_srcdir)/include/$(S11N_NAMESPACE)
include $(toc_makesdir)/symlink_headers.make
-all: namespace flexes symlink-headers $(OBJECTS)
+all: NAMESPACE flexes symlink-headers $(OBJECTS)
COMMONS_DIR = $(ELIB_LIBDIR)/common
|
